]> Pileus Git - ~andy/linux/commitdiff
pinctrl: at91: replace clk_prepare + clk_enable by clk_prepare_enable
authorBoris BREZILLON <b.brezillon@overkiz.com>
Sun, 15 Dec 2013 18:30:52 +0000 (19:30 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 16 Dec 2013 13:22:57 +0000 (14:22 +0100)
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>
drivers/pinctrl/pinctrl-at91.c

index f91c72f878ad4879d6645feae4e1666cc5d4a578..91dea50564dde58813cc9d3b5e47017e6d5b53bc 100644 (file)
@@ -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);