]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
pinctrl/coh901: use clk_prepare_[en|dis]able()
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 19 Jun 2012 21:36:15 +0000 (23:36 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 3 Jul 2012 19:51:08 +0000 (21:51 +0200)
The COH901 GPIO driver did not prepare or unprepare its
clock, so let us fix it to do so.

Acked-by: Pankaj Jangra <jangra.pankaj9@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-coh901.c

index 55697a5d74824acfb7e48e21a27de87512ae4735..cc0f00d73d15512a5d93906088e78d7635971af1 100644 (file)
@@ -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 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
        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);