diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-10-02 19:40:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-24 17:39:06 -0400 |
commit | e1deb56cb775ab953bc5245feaf1f43269409139 (patch) | |
tree | b81e9c57b6d800b172a822d0b4c921fae7db4929 /drivers/usb/host | |
parent | ffc7493df73cf0e3d2c6719f3794696dbc3929a9 (diff) |
usb: ehci-s5p: 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')
-rw-r--r-- | drivers/usb/host/ehci-s5p.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 85b74be202eb..abc178d21fe4 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c | |||
@@ -136,7 +136,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) | |||
136 | goto fail_clk; | 136 | goto fail_clk; |
137 | } | 137 | } |
138 | 138 | ||
139 | err = clk_enable(s5p_ehci->clk); | 139 | err = clk_prepare_enable(s5p_ehci->clk); |
140 | if (err) | 140 | if (err) |
141 | goto fail_clk; | 141 | goto fail_clk; |
142 | 142 | ||
@@ -183,7 +183,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) | |||
183 | return 0; | 183 | return 0; |
184 | 184 | ||
185 | fail_io: | 185 | fail_io: |
186 | clk_disable(s5p_ehci->clk); | 186 | clk_disable_unprepare(s5p_ehci->clk); |
187 | fail_clk: | 187 | fail_clk: |
188 | usb_put_hcd(hcd); | 188 | usb_put_hcd(hcd); |
189 | return err; | 189 | return err; |
@@ -200,7 +200,7 @@ static int __devexit s5p_ehci_remove(struct platform_device *pdev) | |||
200 | if (pdata && pdata->phy_exit) | 200 | if (pdata && pdata->phy_exit) |
201 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); | 201 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); |
202 | 202 | ||
203 | clk_disable(s5p_ehci->clk); | 203 | clk_disable_unprepare(s5p_ehci->clk); |
204 | 204 | ||
205 | usb_put_hcd(hcd); | 205 | usb_put_hcd(hcd); |
206 | 206 | ||
@@ -231,7 +231,7 @@ static int s5p_ehci_suspend(struct device *dev) | |||
231 | if (pdata && pdata->phy_exit) | 231 | if (pdata && pdata->phy_exit) |
232 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); | 232 | pdata->phy_exit(pdev, S5P_USB_PHY_HOST); |
233 | 233 | ||
234 | clk_disable(s5p_ehci->clk); | 234 | clk_disable_unprepare(s5p_ehci->clk); |
235 | 235 | ||
236 | return rc; | 236 | return rc; |
237 | } | 237 | } |
@@ -243,7 +243,7 @@ static int s5p_ehci_resume(struct device *dev) | |||
243 | struct platform_device *pdev = to_platform_device(dev); | 243 | struct platform_device *pdev = to_platform_device(dev); |
244 | struct s5p_ehci_platdata *pdata = pdev->dev.platform_data; | 244 | struct s5p_ehci_platdata *pdata = pdev->dev.platform_data; |
245 | 245 | ||
246 | clk_enable(s5p_ehci->clk); | 246 | clk_prepare_enable(s5p_ehci->clk); |
247 | 247 | ||
248 | if (pdata && pdata->phy_init) | 248 | if (pdata && pdata->phy_init) |
249 | pdata->phy_init(pdev, S5P_USB_PHY_HOST); | 249 | pdata->phy_init(pdev, S5P_USB_PHY_HOST); |