Pinctrl/spear: plgpio: don't call prepare/unprepare

SPEAr SoC's don't do anything in clk_prepare() of plgpio driver,
so there is no need to call this routine multiple times. Just
call it once at probe.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c
index cf6d9c204936..5aebbf780fb5 100644
--- a/drivers/pinctrl/spear/pinctrl-plgpio.c
+++ b/drivers/pinctrl/spear/pinctrl-plgpio.c
@@ -213,7 +213,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
                 return ret;
 
         if (!IS_ERR(plgpio->clk)) {
-                ret = clk_prepare_enable(plgpio->clk);
+                ret = clk_enable(plgpio->clk);
                 if (ret)
                         goto err0;
         }
@@ -244,7 +244,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
 
 err1:
         if (!IS_ERR(plgpio->clk))
-                clk_disable_unprepare(plgpio->clk);
+                clk_disable(plgpio->clk);
 err0:
         pinctrl_free_gpio(gpio);
         return ret;
@@ -275,7 +275,7 @@ static void plgpio_free(struct gpio_chip *chip, unsigned offset)
 
 disable_clk:
         if (!IS_ERR(plgpio->clk))
-                clk_disable_unprepare(plgpio->clk);
+                clk_disable(plgpio->clk);
 
         pinctrl_free_gpio(gpio);
 }
@@ -584,10 +584,18 @@ static int __devinit plgpio_probe(struct platform_device *pdev)
         plgpio->chip.dev = &pdev->dev;
         plgpio->chip.owner = THIS_MODULE;
 
+        if (!IS_ERR(plgpio->clk)) {
+                ret = clk_prepare(plgpio->clk);
+                if (ret) {
+                        dev_err(&pdev->dev, "clk prepare failed\n");
+                        return ret;
+                }
+        }
+
         ret = gpiochip_add(&plgpio->chip);
         if (ret) {
                 dev_err(&pdev->dev, "unable to add gpio chip\n");
-                return ret;
+                goto unprepare_clk;
         }
 
         irq = platform_get_irq(pdev, 0);
@@ -629,6 +637,9 @@ remove_gpiochip:
         dev_info(&pdev->dev, "Remove gpiochip\n");
         if (gpiochip_remove(&plgpio->chip))
                 dev_err(&pdev->dev, "unable to remove gpiochip\n");
+unprepare_clk:
+        if (!IS_ERR(plgpio->clk))
+                clk_unprepare(plgpio->clk);
 
         return ret;
 }