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

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

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: 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 ffc7493d

drivers/usb/host/ehci-s5p.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) 
		goto fail_clk;

		goto fail_clk;

	}

	}





	err = clk_enable(s5p_ehci->clk);

	err = clk_prepare_enable(s5p_ehci->clk);

	if (err)

	if (err)

		goto fail_clk;

		goto fail_clk;
@@ -183,7 +183,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) 
	return 0;

	return 0;





fail_io:

fail_io:

	clk_disable(s5p_ehci->clk);

	clk_disable_unprepare(s5p_ehci->clk);

fail_clk:

fail_clk:

	usb_put_hcd(hcd);

	usb_put_hcd(hcd);

	return err;

	return err;
@@ -200,7 +200,7 @@ static int __devexit s5p_ehci_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(s5p_ehci->clk);

	clk_disable_unprepare(s5p_ehci->clk);





	usb_put_hcd(hcd);

	usb_put_hcd(hcd);
@@ -231,7 +231,7 @@ static int s5p_ehci_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(s5p_ehci->clk);

	clk_disable_unprepare(s5p_ehci->clk);





	return rc;

	return rc;

}

}
@@ -243,7 +243,7 @@ static int s5p_ehci_resume(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;

	struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;





	clk_enable(s5p_ehci->clk);

	clk_prepare_enable(s5p_ehci->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);