hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Abraham 2012-10-03 08:41:37 +09:00 committed by Greg Kroah-Hartman
parent e1deb56cb7
commit c05c946c68
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/host/ohci-exynos.c
View File

@ -123,7 +123,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
goto fail_clk; goto fail_clk;
} }
err = clk_enable(exynos_ohci->clk); err = clk_prepare_enable(exynos_ohci->clk);
if (err) if (err)
goto fail_clken; goto fail_clken;
@ -167,7 +167,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
return 0; return 0;
fail_io: fail_io:
clk_disable(exynos_ohci->clk); clk_disable_unprepare(exynos_ohci->clk);
fail_clken: fail_clken:
clk_put(exynos_ohci->clk); clk_put(exynos_ohci->clk);
fail_clk: fail_clk:
@ -186,7 +186,7 @@ static int __devexit exynos_ohci_remove(struct platform_device *pdev)
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
clk_disable(exynos_ohci->clk); clk_disable_unprepare(exynos_ohci->clk);
clk_put(exynos_ohci->clk); clk_put(exynos_ohci->clk);
usb_put_hcd(hcd); usb_put_hcd(hcd);
@ -232,7 +232,7 @@ static int exynos_ohci_suspend(struct device *dev)
if (pdata && pdata->phy_exit) if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST); pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
clk_disable(exynos_ohci->clk); clk_disable_unprepare(exynos_ohci->clk);
fail: fail:
spin_unlock_irqrestore(&ohci->lock, flags); spin_unlock_irqrestore(&ohci->lock, flags);
@ -247,7 +247,7 @@ static int exynos_ohci_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data; struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
clk_enable(exynos_ohci->clk); clk_prepare_enable(exynos_ohci->clk);
if (pdata && pdata->phy_init) if (pdata && pdata->phy_init)
pdata->phy_init(pdev, S5P_USB_PHY_HOST); pdata->phy_init(pdev, S5P_USB_PHY_HOST);