diff options
| author | Boris BREZILLON <b.brezillon@overkiz.com> | 2013-12-15 19:30:52 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-16 14:22:57 +0100 |
| commit | 37ef1d9243759ca69032be2a68d5d1a87a295fd4 (patch) | |
| tree | caf7fd8619f07363b1e7325cf7051e426e7f0bf1 /drivers/pinctrl | |
| parent | pinctrl: at91: fix clk_unprepare and clk_disable order (diff) | |
| download | linux-37ef1d9243759ca69032be2a68d5d1a87a295fd4.tar.xz linux-37ef1d9243759ca69032be2a68d5d1a87a295fd4.zip | |
pinctrl: at91: replace clk_prepare + clk_enable by clk_prepare_enable
Replace the clk_prepare and clk_enable calls by a single
clk_prepare_enable call.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index f91c72f878ad..91dea50564dd 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -1385,10 +1385,8 @@ void at91_pinctrl_gpio_resume(void) pio = gpio_chips[i]->regbase; - if (!wakeups[i]) { - if (clk_prepare(gpio_chips[i]->clock) == 0) - clk_enable(gpio_chips[i]->clock); - } + if (!wakeups[i]) + clk_prepare_enable(gpio_chips[i]->clock); __raw_writel(wakeups[i], pio + PIO_IDR); __raw_writel(backups[i], pio + PIO_IER); |