Skip to content

Commit

Permalink
usb: ohci-exynos: use clk_prepare_enable and clk_disable_unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Abraham authored and Greg Kroah-Hartman committed Oct 24, 2012
1 parent e1deb56 commit c05c946
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/usb/host/ohci-exynos.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
goto fail_clk;
}

err = clk_enable(exynos_ohci->clk);
err = clk_prepare_enable(exynos_ohci->clk);
if (err)
goto fail_clken;

Expand Down Expand Up @@ -167,7 +167,7 @@ static int __devinit exynos_ohci_probe(struct platform_device *pdev)
return 0;

fail_io:
clk_disable(exynos_ohci->clk);
clk_disable_unprepare(exynos_ohci->clk);
fail_clken:
clk_put(exynos_ohci->clk);
fail_clk:
Expand All @@ -186,7 +186,7 @@ static int __devexit exynos_ohci_remove(struct platform_device *pdev)
if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST);

clk_disable(exynos_ohci->clk);
clk_disable_unprepare(exynos_ohci->clk);
clk_put(exynos_ohci->clk);

usb_put_hcd(hcd);
Expand Down Expand Up @@ -232,7 +232,7 @@ static int exynos_ohci_suspend(struct device *dev)
if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST);

clk_disable(exynos_ohci->clk);
clk_disable_unprepare(exynos_ohci->clk);

fail:
spin_unlock_irqrestore(&ohci->lock, flags);
Expand All @@ -247,7 +247,7 @@ static int exynos_ohci_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
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)
pdata->phy_init(pdev, S5P_USB_PHY_HOST);
Expand Down

0 comments on commit c05c946

Please sign in to comment.