2012-06-20 08:42:32

by Linus Walleij

Subject: [PATCH v2] pinctrl/coh901: use clk_prepare_[en|dis]able()

From: Linus Walleij <[email protected]>

The COH901 GPIO driver did not prepare or unprepare its
clock, so let us fix it to do so.

Cc: Pankaj Jangra <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
---
ChangeLog v1->v2:
- Fix up to use clk_disable_unprepare() on error and exit paths,
noticed by Pankaj Jangra.
---
drivers/pinctrl/pinctrl-coh901.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index 55697a5..cc0f00d 100644
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -770,7 +770,7 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
dev_err(gpio->dev, "could not get GPIO clock\n");
goto err_no_clk;
}
- err = clk_enable(gpio->clk);
+ err = clk_prepare_enable(gpio->clk);
if (err) {
dev_err(gpio->dev, "could not enable GPIO clock\n");
goto err_no_clk_enable;
@@ -912,7 +912,7 @@ err_no_ioremap:
release_mem_region(gpio->memres->start, resource_size(gpio->memres));
err_no_ioregion:
err_no_resource:
- clk_disable(gpio->clk);
+ clk_disable_unprepare(gpio->clk);
err_no_clk_enable:
clk_put(gpio->clk);
err_no_clk:
@@ -943,7 +943,7 @@ static int __exit u300_gpio_remove(struct platform_device *pdev)
iounmap(gpio->base);
release_mem_region(gpio->memres->start,
resource_size(gpio->memres));
- clk_disable(gpio->clk);
+ clk_disable_unprepare(gpio->clk);
clk_put(gpio->clk);
platform_set_drvdata(pdev, NULL);
kfree(gpio);
--
1.7.9.2

2012-06-20 15:40:17

by Pankaj Jangra

Subject: Re: [PATCH v2] pinctrl/coh901: use clk_prepare_[en|dis]able()

On Wed, Jun 20, 2012 at 2:12 PM, Linus Walleij
<[email protected]> wrote:
> From: Linus Walleij <[email protected]>
>
> The COH901 GPIO driver did not prepare or unprepare its
> clock, so let us fix it to do so.
>
> Cc: Pankaj Jangra <[email protected]>
> Signed-off-by: Linus Walleij <[email protected]>
> ---
> ChangeLog v1->v2:
> - Fix up to use clk_disable_unprepare() on error and exit paths,
> ?noticed by Pankaj Jangra.
> ---
> ?drivers/pinctrl/pinctrl-coh901.c | ? ?6 +++---
> ?1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Pankaj Jangra <[email protected]>

Regards,
Pankaj Jangra