drivers/gpio/gpio-pxa.c: use clk_prepare_enable and clk_disable_unprepare

Clk_prepare_enable and clk_disable_unprepare combine clk_prepare and
clk_enable, and clk_disable and clk_unprepare.  They make the code more
concise, and ensure that clk_unprepare is called when clk_enable fails.

A simplified version of the semantic patch that introduces calls to these
functions is as follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e;
@@

- clk_prepare(e);
- clk_enable(e);
+ clk_prepare_enable(e);

@@
expression e;
@@

- clk_disable(e);
- clk_unprepare(e);
+ clk_disable_unprepare(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 9cac88a65f78402e2a45b919799576810d9ab9fd..528de0fa0c9ecf880a263e93a183726c9e12f0f3 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -620,19 +620,12 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev)
                iounmap(gpio_reg_base);
                return PTR_ERR(clk);
        }
-       ret = clk_prepare(clk);
+       ret = clk_prepare_enable(clk);
        if (ret) {
                clk_put(clk);
                iounmap(gpio_reg_base);
                return ret;
        }
-       ret = clk_enable(clk);
-       if (ret) {
-               clk_unprepare(clk);
-               clk_put(clk);
-               iounmap(gpio_reg_base);
-               return ret;
-       }
 
        /* Initialize GPIO chips */
        info = dev_get_platdata(&pdev->dev);