mirror of
https://github.com/torvalds/linux.git
synced 2024-11-12 23:23:03 +00:00
usb: ehci-exynos: Use devm_clk_get_enabled() helpers
The devm_clk_get_enabled() helpers: - call devm_clk_get() - call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code and avoids the calls to clk_disable_unprepare(). Signed-off-by: Anand Moon <linux.amoon@gmail.com> Reviewed-by: Alan Stern <stern@rowland.harvard.edu> Link: https://lore.kernel.org/r/20240412142317.5191-2-linux.amoon@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bd2cd796d2
commit
1ac579a4bf
@ -159,20 +159,16 @@ static int exynos_ehci_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
|
err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
|
||||||
if (err)
|
if (err)
|
||||||
goto fail_clk;
|
goto fail_io;
|
||||||
|
|
||||||
exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
|
exynos_ehci->clk = devm_clk_get_enabled(&pdev->dev, "usbhost");
|
||||||
|
|
||||||
if (IS_ERR(exynos_ehci->clk)) {
|
if (IS_ERR(exynos_ehci->clk)) {
|
||||||
dev_err(&pdev->dev, "Failed to get usbhost clock\n");
|
dev_err(&pdev->dev, "Failed to get usbhost clock\n");
|
||||||
err = PTR_ERR(exynos_ehci->clk);
|
err = PTR_ERR(exynos_ehci->clk);
|
||||||
goto fail_clk;
|
goto fail_io;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = clk_prepare_enable(exynos_ehci->clk);
|
|
||||||
if (err)
|
|
||||||
goto fail_clk;
|
|
||||||
|
|
||||||
hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
|
||||||
if (IS_ERR(hcd->regs)) {
|
if (IS_ERR(hcd->regs)) {
|
||||||
err = PTR_ERR(hcd->regs);
|
err = PTR_ERR(hcd->regs);
|
||||||
@ -223,8 +219,6 @@ fail_add_hcd:
|
|||||||
exynos_ehci_phy_disable(&pdev->dev);
|
exynos_ehci_phy_disable(&pdev->dev);
|
||||||
pdev->dev.of_node = exynos_ehci->of_node;
|
pdev->dev.of_node = exynos_ehci->of_node;
|
||||||
fail_io:
|
fail_io:
|
||||||
clk_disable_unprepare(exynos_ehci->clk);
|
|
||||||
fail_clk:
|
|
||||||
usb_put_hcd(hcd);
|
usb_put_hcd(hcd);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@ -240,8 +234,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
|
|||||||
|
|
||||||
exynos_ehci_phy_disable(&pdev->dev);
|
exynos_ehci_phy_disable(&pdev->dev);
|
||||||
|
|
||||||
clk_disable_unprepare(exynos_ehci->clk);
|
|
||||||
|
|
||||||
usb_put_hcd(hcd);
|
usb_put_hcd(hcd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user