diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-10-02 19:41:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-24 17:39:06 -0400 |
commit | c05c946c68e381074dde259d8ce243da1b1aae02 (patch) | |
tree | 90037077fb4be4d2f92beb1a5c4eeb39ea61c8a4 /drivers/usb/host/ohci-exynos.c | |
parent | e1deb56cb775ab953bc5245feaf1f43269409139 (diff) |
usb: ohci-exynos: use clk_prepare_enable and clk_disable_unprepare
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ohci-exynos.c')
-rw-r--r-- | drivers/usb/host/ohci-exynos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index 929a49437e2e..9e3d2da7537a 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c | |||
@@ -123,7 +123,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev) | |||
123 | goto fail_clk; | 123 | goto fail_clk; |
124 | } | 124 | } |
125 | 125 | ||
126 | err = clk_enable(exynos_ohci->clk); | 126 | err = clk_prepare_enable(exynos_ohci->clk); |
127 | if (err) | 127 | if (err) |
128 | goto fail_clken; | 128 | goto fail_clken; |
129 | 129 | ||
@@ -167,7 +167,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev) | |||
167 | return 0; | 167 | return 0; |
168 | 168 | ||
169 | fail_io: | 169 | fail_io: |
170 | clk_disable(exynos_ohci->clk); | 170 | clk_disable_unprepare(exynos_ohci->clk); |
171 | fail_clken: | 171 | fail_clken: |
172 | clk_put(exynos_ohci->clk); | 172 | clk_put(exynos_ohci->clk); |
173 | fail_clk: | 173 | fail_clk: |
@@ -186,7 +186,7 @@ static int __devexit exynos_ohci_remove(struct platform_device *pdev) | |||
186 | if (pdata && pdata->phy_exit) | 186 | if (pdata && pdata->phy_exit) |
187 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); | 187 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); |
188 | 188 | ||
189 | clk_disable(exynos_ohci->clk); | 189 | clk_disable_unprepare(exynos_ohci->clk); |
190 | clk_put(exynos_ohci->clk); | 190 | clk_put(exynos_ohci->clk); |
191 | 191 | ||
192 | usb_put_hcd(hcd); | 192 | usb_put_hcd(hcd); |
@@ -232,7 +232,7 @@ static int exynos_ohci_suspend(struct device *dev) | |||
232 | if (pdata && pdata->phy_exit) | 232 | if (pdata && pdata->phy_exit) |
233 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); | 233 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); |
234 | 234 | ||
235 | clk_disable(exynos_ohci->clk); | 235 | clk_disable_unprepare(exynos_ohci->clk); |
236 | 236 | ||
237 | fail: | 237 | fail: |
238 | spin_unlock_irqrestore(&ohci->lock, flags); | 238 | spin_unlock_irqrestore(&ohci->lock, flags); |
@@ -247,7 +247,7 @@ static int exynos_ohci_resume(struct device *dev) | |||
247 | struct platform_device *pdev = to_platform_device(dev); | 247 | struct platform_device *pdev = to_platform_device(dev); |
248 | struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; | 248 | struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; |
249 | 249 | ||
250 | clk_enable(exynos_ohci->clk); | 250 | clk_prepare_enable(exynos_ohci->clk); |
251 | 251 | ||
252 | if (pdata && pdata->phy_init) | 252 | if (pdata && pdata->phy_init) |
253 | pdata->phy_init(pdev, S5P_USB_PHY_HOST); | 253 | pdata->phy_init(pdev, S5P_USB_PHY_HOST); |