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>
This commit is contained in:
Julia Lawall 2012-08-26 18:00:55 +02:00 коммит произвёл Linus Walleij
Родитель ce6b658dc0
Коммит 6ab49f4201
1 изменённых файлов: 1 добавлений и 8 удалений

Просмотреть файл

@ -620,19 +620,12 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev)
iounmap(gpio_reg_base); iounmap(gpio_reg_base);
return PTR_ERR(clk); return PTR_ERR(clk);
} }
ret = clk_prepare(clk); ret = clk_prepare_enable(clk);
if (ret) { if (ret) {
clk_put(clk); clk_put(clk);
iounmap(gpio_reg_base); iounmap(gpio_reg_base);
return ret; return ret;
} }
ret = clk_enable(clk);
if (ret) {
clk_unprepare(clk);
clk_put(clk);
iounmap(gpio_reg_base);
return ret;
}
/* Initialize GPIO chips */ /* Initialize GPIO chips */
info = dev_get_platdata(&pdev->dev); info = dev_get_platdata(&pdev->dev);