Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c05c946c authored by Thomas Abraham's avatar Thomas Abraham Committed by Greg Kroah-Hartman
Browse files

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: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1deb56c

drivers/usb/host/ohci-exynos.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -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);