usb: dwc3: imx8mp: simplify with devm_clk_get_enabled

Use devm_clk_get_enabled() to drop clock preparing and handling from
error and remove paths.  This makes the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/20240814-b4-cleanup-h-of-node-put-usb-v1-4-95481b9682bc@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc3/dwc3-imx8mp.c b/drivers/usb/dwc3/dwc3-imx8mp.c
index 392fa1232788c20bf78ba79411a1d952a1a4b1a6..8c91e595d3b9e8818220dd415bb34e6ddc43b8fe 100644 (file)
--- a/drivers/usb/dwc3/dwc3-imx8mp.c
+++ b/drivers/usb/dwc3/dwc3-imx8mp.c
@@ -178,37 +178,23 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev)
                        return PTR_ERR(dwc3_imx->glue_base);
        }
 
-       dwc3_imx->hsio_clk = devm_clk_get(dev, "hsio");
+       dwc3_imx->hsio_clk = devm_clk_get_enabled(dev, "hsio");
        if (IS_ERR(dwc3_imx->hsio_clk)) {
                err = PTR_ERR(dwc3_imx->hsio_clk);
                dev_err(dev, "Failed to get hsio clk, err=%d\n", err);
                return err;
        }
 
-       err = clk_prepare_enable(dwc3_imx->hsio_clk);
-       if (err) {
-               dev_err(dev, "Failed to enable hsio clk, err=%d\n", err);
-               return err;
-       }
-
-       dwc3_imx->suspend_clk = devm_clk_get(dev, "suspend");
+       dwc3_imx->suspend_clk = devm_clk_get_enabled(dev, "suspend");
        if (IS_ERR(dwc3_imx->suspend_clk)) {
                err = PTR_ERR(dwc3_imx->suspend_clk);
                dev_err(dev, "Failed to get suspend clk, err=%d\n", err);
-               goto disable_hsio_clk;
-       }
-
-       err = clk_prepare_enable(dwc3_imx->suspend_clk);
-       if (err) {
-               dev_err(dev, "Failed to enable suspend clk, err=%d\n", err);
-               goto disable_hsio_clk;
+               return err;
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               err = irq;
-               goto disable_clks;
-       }
+       if (irq < 0)
+               return irq;
        dwc3_imx->irq = irq;
 
        imx8mp_configure_glue(dwc3_imx);
@@ -259,25 +245,17 @@ err_node_put:
 disable_rpm:
        pm_runtime_disable(dev);
        pm_runtime_put_noidle(dev);
-disable_clks:
-       clk_disable_unprepare(dwc3_imx->suspend_clk);
-disable_hsio_clk:
-       clk_disable_unprepare(dwc3_imx->hsio_clk);
 
        return err;
 }
 
 static void dwc3_imx8mp_remove(struct platform_device *pdev)
 {
-       struct dwc3_imx8mp *dwc3_imx = platform_get_drvdata(pdev);
        struct device *dev = &pdev->dev;
 
        pm_runtime_get_sync(dev);
        of_platform_depopulate(dev);
 
-       clk_disable_unprepare(dwc3_imx->suspend_clk);
-       clk_disable_unprepare(dwc3_imx->hsio_clk);
-
        pm_runtime_disable(dev);
        pm_runtime_put_noidle(dev);
 }