[PATCH V3 03/14] ARM: mxc: ahci: add clk_prepare/clk_unprepare

[Richard Zhao]

Signed-off-by: Richard Zhao <richard.z...@linaro.org>
---
 arch/arm/plat-mxc/devices/platform-ahci-imx.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/plat-mxc/devices/platform-ahci-imx.c 
b/arch/arm/plat-mxc/devices/platform-ahci-imx.c
index d8a56ae..ade4a1c 100644
--- a/arch/arm/plat-mxc/devices/platform-ahci-imx.c
+++ b/arch/arm/plat-mxc/devices/platform-ahci-imx.c
@@ -60,9 +60,9 @@ static int imx_sata_init(struct device *dev, void __iomem 
*addr)
                dev_err(dev, "no sata clock.\n");
                return PTR_ERR(sata_clk);
        }
-       ret = clk_enable(sata_clk);
+       ret = clk_prepare_enable(sata_clk);
        if (ret) {
-               dev_err(dev, "can't enable sata clock.\n");
+               dev_err(dev, "can't prepare/enable sata clock.\n");
                goto put_sata_clk;
        }
 
@@ -73,9 +73,9 @@ static int imx_sata_init(struct device *dev, void __iomem 
*addr)
                ret = PTR_ERR(sata_ref_clk);
                goto release_sata_clk;
        }
-       ret = clk_enable(sata_ref_clk);
+       ret = clk_prepare_enable(sata_ref_clk);
        if (ret) {
-               dev_err(dev, "can't enable sata ref clock.\n");
+               dev_err(dev, "can't prepare/enable sata ref clock.\n");
                goto put_sata_ref_clk;
        }
 
@@ -104,11 +104,11 @@ static int imx_sata_init(struct device *dev, void __iomem 
*addr)
        return 0;
 
 release_sata_ref_clk:
-       clk_disable(sata_ref_clk);
+       clk_disable_unprepare(sata_ref_clk);
 put_sata_ref_clk:
        clk_put(sata_ref_clk);
 release_sata_clk:
-       clk_disable(sata_clk);
+       clk_disable_unprepare(sata_clk);
 put_sata_clk:
        clk_put(sata_clk);
 
@@ -117,10 +117,10 @@ put_sata_clk:
 
 static void imx_sata_exit(struct device *dev)
 {
-       clk_disable(sata_ref_clk);
+       clk_disable_unprepare(sata_ref_clk);
        clk_put(sata_ref_clk);
 
-       clk_disable(sata_clk);
+       clk_disable_unprepare(sata_clk);
        clk_put(sata_clk);
 
 }
-- 
1.7.5.4


--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html