[PATCH v2 3/9] usb: chipidea: usb2: use devm_clk_get_optional_enabled()
From: Junzhong Pan <hidden>
Date: 2026-09-08 09:49:34
Also in:
linux-devicetree, linux-riscv, lkml, spacemit
Subsystem:
chipidea usb high speed dual role controller, the rest, usb subsystem · Maintainers:
Peter Chen, Linus Torvalds, Greg Kroah-Hartman
Convert devm_clk_get_optional() and clk_prepare_enable() into a single call devm_clk_get_optional_enabled(). Signed-off-by: Junzhong Pan <redacted> --- drivers/usb/chipidea/ci_hdrc_usb2.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c
index 8ffa1e95d8e8..6fae2d4a053a 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c@@ -70,15 +70,10 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->clk = devm_clk_get_optional(dev, NULL); + priv->clk = devm_clk_get_optional_enabled(dev, NULL); if (IS_ERR(priv->clk)) - return PTR_ERR(priv->clk); - - ret = clk_prepare_enable(priv->clk); - if (ret) { - dev_err(dev, "failed to enable the clock: %d\n", ret); - return ret; - } + return dev_err_probe(dev, PTR_ERR(priv->clk), + "failed to get or enable the clock\n"); ci_pdata->name = dev_name(dev);
@@ -90,7 +85,7 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) dev_err(dev, "failed to register ci_hdrc platform device: %d\n", ret); - goto clk_err; + return ret; } platform_set_drvdata(pdev, priv);
@@ -99,10 +94,6 @@ static int ci_hdrc_usb2_probe(struct platform_device *pdev) pm_runtime_enable(dev); return 0; - -clk_err: - clk_disable_unprepare(priv->clk); - return ret; } static void ci_hdrc_usb2_remove(struct platform_device *pdev)
--
2.34.1