summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorBoris BREZILLON <b.brezillon@overkiz.com>2013-12-15 19:30:52 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-12-16 14:22:57 +0100
commit37ef1d9243759ca69032be2a68d5d1a87a295fd4 (patch)
treecaf7fd8619f07363b1e7325cf7051e426e7f0bf1 /drivers/pinctrl
parent795f9953eaccf9e343cad9aecbf8956046090d76 (diff)
downloadop-kernel-dev-37ef1d9243759ca69032be2a68d5d1a87a295fd4.zip
op-kernel-dev-37ef1d9243759ca69032be2a68d5d1a87a295fd4.tar.gz
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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index f91c72f..91dea50 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);
OpenPOWER on IntegriCloud