diff options
| -rw-r--r-- | 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 d8a56aee521b..ade4a1c4e2a3 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) | |||
| 60 | dev_err(dev, "no sata clock.\n"); | 60 | dev_err(dev, "no sata clock.\n"); |
| 61 | return PTR_ERR(sata_clk); | 61 | return PTR_ERR(sata_clk); |
| 62 | } | 62 | } |
| 63 | ret = clk_enable(sata_clk); | 63 | ret = clk_prepare_enable(sata_clk); |
| 64 | if (ret) { | 64 | if (ret) { |
| 65 | dev_err(dev, "can't enable sata clock.\n"); | 65 | dev_err(dev, "can't prepare/enable sata clock.\n"); |
| 66 | goto put_sata_clk; | 66 | goto put_sata_clk; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| @@ -73,9 +73,9 @@ static int imx_sata_init(struct device *dev, void __iomem *addr) | |||
| 73 | ret = PTR_ERR(sata_ref_clk); | 73 | ret = PTR_ERR(sata_ref_clk); |
| 74 | goto release_sata_clk; | 74 | goto release_sata_clk; |
| 75 | } | 75 | } |
| 76 | ret = clk_enable(sata_ref_clk); | 76 | ret = clk_prepare_enable(sata_ref_clk); |
| 77 | if (ret) { | 77 | if (ret) { |
| 78 | dev_err(dev, "can't enable sata ref clock.\n"); | 78 | dev_err(dev, "can't prepare/enable sata ref clock.\n"); |
| 79 | goto put_sata_ref_clk; | 79 | goto put_sata_ref_clk; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| @@ -104,11 +104,11 @@ static int imx_sata_init(struct device *dev, void __iomem *addr) | |||
| 104 | return 0; | 104 | return 0; |
| 105 | 105 | ||
| 106 | release_sata_ref_clk: | 106 | release_sata_ref_clk: |
| 107 | clk_disable(sata_ref_clk); | 107 | clk_disable_unprepare(sata_ref_clk); |
| 108 | put_sata_ref_clk: | 108 | put_sata_ref_clk: |
| 109 | clk_put(sata_ref_clk); | 109 | clk_put(sata_ref_clk); |
| 110 | release_sata_clk: | 110 | release_sata_clk: |
| 111 | clk_disable(sata_clk); | 111 | clk_disable_unprepare(sata_clk); |
| 112 | put_sata_clk: | 112 | put_sata_clk: |
| 113 | clk_put(sata_clk); | 113 | clk_put(sata_clk); |
| 114 | 114 | ||
| @@ -117,10 +117,10 @@ put_sata_clk: | |||
| 117 | 117 | ||
| 118 | static void imx_sata_exit(struct device *dev) | 118 | static void imx_sata_exit(struct device *dev) |
| 119 | { | 119 | { |
| 120 | clk_disable(sata_ref_clk); | 120 | clk_disable_unprepare(sata_ref_clk); |
| 121 | clk_put(sata_ref_clk); | 121 | clk_put(sata_ref_clk); |
| 122 | 122 | ||
| 123 | clk_disable(sata_clk); | 123 | clk_disable_unprepare(sata_clk); |
| 124 | clk_put(sata_clk); | 124 | clk_put(sata_clk); |
| 125 | 125 | ||
| 126 | } | 126 | } |
