Messages in this thread Patch in this message | | | From | Julia Lawall <> | Subject | [PATCH 3/13] drivers/gpio/gpio-pxa.c: use clk_prepare_enable and clk_disable_unprepare | Date | Sun, 26 Aug 2012 18:00:55 +0200 |
| |
From: Julia Lawall <Julia.Lawall@lip6.fr>
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>
--- drivers/gpio/gpio-pxa.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 9528779..bd8fb66 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -589,19 +589,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);
| |