[ 150/150] usb: musb: ux500: use clk_prepare_enable and clk_disable_unprepare

Greg Kroah-Hartman
2013-02-27T00:38:26Z

From: Fabio Baltieri <fabio.baltieri@linaro.org>

commit 99d17cfa3bbc6f4edb175f819af59c6b9e245e82 upstream.

This patch converts the module to use clk_prepare_enable and
clk_disable_unprepare variants as required by common clock framework.

Without this the system crash during probe function.

Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
drivers/usb/musb/ux500.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -108,7 +108,7 @@ static int ux500_probe(struct platform_d
goto err3;
}

- ret = clk_enable(clk);
+ ret = clk_prepare_enable(clk);
if (ret) {
dev_err(&pdev->dev, "failed to enable clock\n");
goto err4;
@@ -148,7 +148,7 @@ static int ux500_probe(struct platform_d
return 0;

err5:
- clk_disable(clk);
+ clk_disable_unprepare(clk);

err4:
clk_put(clk);
@@ -168,7 +168,7 @@ static int ux500_remove(struct platform_
struct ux500_glue *glue = platform_get_drvdata(pdev);

platform_device_unregister(glue->musb);
- clk_disable(glue->clk);
+ clk_disable_unprepare(glue->clk);
clk_put(glue->clk);
kfree(glue);

@@ -182,7 +182,7 @@ static int ux500_suspend(struct device *
struct musb *musb = glue_to_musb(glue);

usb_phy_set_suspend(musb->xceiv, 1);
- clk_disable(glue->clk);
+ clk_disable_unprepare(glue->clk);

return 0;
}
@@ -193,7 +193,7 @@ static int ux500_resume(struct device *d
struct musb *musb = glue_to_musb(glue);
int ret;

- ret = clk_enable(glue->clk);
+ ret = clk_prepare_enable(glue->clk);
if (ret) {
dev_err(dev, "failed to enable clock\n");
return ret;