drivers/mmc/host/sdhci-pxav3.c | 42 +++++++++++++++------------------- 1 file changed, 19 insertions(+), 23 deletions(-)
Replace devm_clk_get() plus clk_prepare_enable() with the managed
variants devm_clk_get_enabled() and devm_clk_get_optional_enabled().
The core clock becomes optional, which removes the IS_ERR() guards
in runtime suspend/resume and lets devms unwind the clocks, so the
manual clk_disable_unprepare() calls in the probe error paths and
remove are dropped.
clk_prepare_enable() and friends are NULL safe, so no need to check if
the optional clock is present.
Also handle failures of clk_prepare_enable() in runtime resume instead
of ignoring them: a failed enable would leave controller register
accesses hitting unclocked hardware. Bail out before resuming the host
and unwind clk_io when enabling clk_core fails. This also drops the
now unused pltfm_host variable from remove().
Assisted-by: LLM
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/mmc/host/sdhci-pxav3.c | 42 +++++++++++++++-------------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index f39764ffd4a0..c2ad801dc9a8 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -413,19 +413,18 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
pltfm_host = sdhci_priv(host);
pxa = sdhci_pltfm_priv(pltfm_host);
- pxa->clk_io = devm_clk_get(dev, "io");
+ pxa->clk_io = devm_clk_get_enabled(dev, "io");
if (IS_ERR(pxa->clk_io))
- pxa->clk_io = devm_clk_get(dev, NULL);
+ pxa->clk_io = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(pxa->clk_io)) {
dev_err(dev, "failed to get io clock\n");
return PTR_ERR(pxa->clk_io);
}
pltfm_host->clk = pxa->clk_io;
- clk_prepare_enable(pxa->clk_io);
- pxa->clk_core = devm_clk_get(dev, "core");
- if (!IS_ERR(pxa->clk_core))
- clk_prepare_enable(pxa->clk_core);
+ pxa->clk_core = devm_clk_get_optional_enabled(dev, "core");
+ if (IS_ERR(pxa->clk_core))
+ return PTR_ERR(pxa->clk_core);
host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY;
/* enable 1/8V DDR capable */
@@ -434,17 +433,17 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
if (device_is_compatible(dev, "marvell,armada-380-sdhci")) {
ret = armada_38x_quirks(pdev, host);
if (ret < 0)
- goto err_mbus_win;
+ return ret;
ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
if (ret < 0)
- goto err_mbus_win;
+ return ret;
}
match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev);
if (match) {
ret = mmc_of_parse(host->mmc);
if (ret)
- goto err_of_parse;
+ return ret;
sdhci_get_of_property(pdev);
pdata = pxav3_get_mmc_pdata(dev);
pdev->dev.platform_data = pdata;
@@ -499,27 +498,18 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
err_add_host:
pm_runtime_disable(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
-err_of_parse:
-err_mbus_win:
- clk_disable_unprepare(pxa->clk_io);
- clk_disable_unprepare(pxa->clk_core);
return ret;
}
static void sdhci_pxav3_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
- struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
pm_runtime_get_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
sdhci_remove_host(host, 1);
-
- clk_disable_unprepare(pxa->clk_io);
- clk_disable_unprepare(pxa->clk_core);
}
static int sdhci_pxav3_suspend(struct device *dev)
@@ -560,8 +550,7 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev)
mmc_retune_needed(host->mmc);
clk_disable_unprepare(pxa->clk_io);
- if (!IS_ERR(pxa->clk_core))
- clk_disable_unprepare(pxa->clk_core);
+ clk_disable_unprepare(pxa->clk_core);
return 0;
}
@@ -571,10 +560,17 @@ static int sdhci_pxav3_runtime_resume(struct device *dev)
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
+ int ret;
- clk_prepare_enable(pxa->clk_io);
- if (!IS_ERR(pxa->clk_core))
- clk_prepare_enable(pxa->clk_core);
+ ret = clk_prepare_enable(pxa->clk_io);
+ if (ret)
+ return ret;
+
+ ret = clk_prepare_enable(pxa->clk_core);
+ if (ret) {
+ clk_disable_unprepare(pxa->clk_io);
+ return ret;
+ }
sdhci_runtime_resume_host(host, 0);
return 0;
--
2.55.0On 15/09/2026 21:04, Rosen Penev wrote:
> Replace devm_clk_get() plus clk_prepare_enable() with the managed
> variants devm_clk_get_enabled() and devm_clk_get_optional_enabled().
> The core clock becomes optional, which removes the IS_ERR() guards
> in runtime suspend/resume and lets devms unwind the clocks, so the
> manual clk_disable_unprepare() calls in the probe error paths and
> remove are dropped.
>
> clk_prepare_enable() and friends are NULL safe, so no need to check if
> the optional clock is present.
>
> Also handle failures of clk_prepare_enable() in runtime resume instead
> of ignoring them: a failed enable would leave controller register
> accesses hitting unclocked hardware. Bail out before resuming the host
> and unwind clk_io when enabling clk_core fails. This also drops the
> now unused pltfm_host variable from remove().
>
> Assisted-by: LLM
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
Please remember to put something in [PATCH] when sending a patch
a second time. "V2" with a change log saying it is just re-based
for example.
> ---
> drivers/mmc/host/sdhci-pxav3.c | 42 +++++++++++++++-------------------
> 1 file changed, 19 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
> index f39764ffd4a0..c2ad801dc9a8 100644
> --- a/drivers/mmc/host/sdhci-pxav3.c
> +++ b/drivers/mmc/host/sdhci-pxav3.c
> @@ -413,19 +413,18 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> pltfm_host = sdhci_priv(host);
> pxa = sdhci_pltfm_priv(pltfm_host);
>
> - pxa->clk_io = devm_clk_get(dev, "io");
> + pxa->clk_io = devm_clk_get_enabled(dev, "io");
> if (IS_ERR(pxa->clk_io))
> - pxa->clk_io = devm_clk_get(dev, NULL);
> + pxa->clk_io = devm_clk_get_enabled(dev, NULL);
Let's follow sdhci-pxav2 approach e.g. from sdhci_pxav2_probe()
clk = devm_clk_get_optional_enabled(dev, "io");
if (!clk)
clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(clk))
return dev_err_probe(dev, PTR_ERR(clk), "failed to get io clock\n");
> if (IS_ERR(pxa->clk_io)) {
> dev_err(dev, "failed to get io clock\n");
> return PTR_ERR(pxa->clk_io);
> }
> pltfm_host->clk = pxa->clk_io;
> - clk_prepare_enable(pxa->clk_io);
>
> - pxa->clk_core = devm_clk_get(dev, "core");
> - if (!IS_ERR(pxa->clk_core))
> - clk_prepare_enable(pxa->clk_core);
> + pxa->clk_core = devm_clk_get_optional_enabled(dev, "core");
> + if (IS_ERR(pxa->clk_core))
> + return PTR_ERR(pxa->clk_core);
>
> host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY;
> /* enable 1/8V DDR capable */
> @@ -434,17 +433,17 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> if (device_is_compatible(dev, "marvell,armada-380-sdhci")) {
> ret = armada_38x_quirks(pdev, host);
> if (ret < 0)
> - goto err_mbus_win;
> + return ret;
> ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
> if (ret < 0)
> - goto err_mbus_win;
> + return ret;
> }
>
> match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev);
> if (match) {
> ret = mmc_of_parse(host->mmc);
> if (ret)
> - goto err_of_parse;
> + return ret;
> sdhci_get_of_property(pdev);
> pdata = pxav3_get_mmc_pdata(dev);
> pdev->dev.platform_data = pdata;
> @@ -499,27 +498,18 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> err_add_host:
> pm_runtime_disable(&pdev->dev);
> pm_runtime_put_noidle(&pdev->dev);
> -err_of_parse:
> -err_mbus_win:
> - clk_disable_unprepare(pxa->clk_io);
> - clk_disable_unprepare(pxa->clk_core);
> return ret;
> }
>
> static void sdhci_pxav3_remove(struct platform_device *pdev)
> {
> struct sdhci_host *host = platform_get_drvdata(pdev);
> - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> - struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
>
> pm_runtime_get_sync(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
> pm_runtime_put_noidle(&pdev->dev);
>
> sdhci_remove_host(host, 1);
> -
> - clk_disable_unprepare(pxa->clk_io);
> - clk_disable_unprepare(pxa->clk_core);
> }
>
> static int sdhci_pxav3_suspend(struct device *dev)
> @@ -560,8 +550,7 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev)
> mmc_retune_needed(host->mmc);
>
> clk_disable_unprepare(pxa->clk_io);
> - if (!IS_ERR(pxa->clk_core))
> - clk_disable_unprepare(pxa->clk_core);
> + clk_disable_unprepare(pxa->clk_core);
>
> return 0;
> }
> @@ -571,10 +560,17 @@ static int sdhci_pxav3_runtime_resume(struct device *dev)
> struct sdhci_host *host = dev_get_drvdata(dev);
> struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
> + int ret;
>
> - clk_prepare_enable(pxa->clk_io);
> - if (!IS_ERR(pxa->clk_core))
> - clk_prepare_enable(pxa->clk_core);
> + ret = clk_prepare_enable(pxa->clk_io);
> + if (ret)
> + return ret;
> +
> + ret = clk_prepare_enable(pxa->clk_core);
> + if (ret) {
> + clk_disable_unprepare(pxa->clk_io);
> + return ret;
> + }
>
> sdhci_runtime_resume_host(host, 0);
> return 0;
On Tue, Sep 15, 2026 at 11:04 AM Rosen Penev <rosenp@gmail.com> wrote:
>
> Replace devm_clk_get() plus clk_prepare_enable() with the managed
> variants devm_clk_get_enabled() and devm_clk_get_optional_enabled().
> The core clock becomes optional, which removes the IS_ERR() guards
> in runtime suspend/resume and lets devms unwind the clocks, so the
> manual clk_disable_unprepare() calls in the probe error paths and
> remove are dropped.
>
> clk_prepare_enable() and friends are NULL safe, so no need to check if
> the optional clock is present.
>
> Also handle failures of clk_prepare_enable() in runtime resume instead
> of ignoring them: a failed enable would leave controller register
> accesses hitting unclocked hardware. Bail out before resuming the host
> and unwind clk_io when enabling clk_core fails. This also drops the
> now unused pltfm_host variable from remove().
>
> Assisted-by: LLM
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
ugh this should have been a v2. I'll send a v3 tomorrow.
> ---
> drivers/mmc/host/sdhci-pxav3.c | 42 +++++++++++++++-------------------
> 1 file changed, 19 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
> index f39764ffd4a0..c2ad801dc9a8 100644
> --- a/drivers/mmc/host/sdhci-pxav3.c
> +++ b/drivers/mmc/host/sdhci-pxav3.c
> @@ -413,19 +413,18 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> pltfm_host = sdhci_priv(host);
> pxa = sdhci_pltfm_priv(pltfm_host);
>
> - pxa->clk_io = devm_clk_get(dev, "io");
> + pxa->clk_io = devm_clk_get_enabled(dev, "io");
> if (IS_ERR(pxa->clk_io))
> - pxa->clk_io = devm_clk_get(dev, NULL);
> + pxa->clk_io = devm_clk_get_enabled(dev, NULL);
> if (IS_ERR(pxa->clk_io)) {
> dev_err(dev, "failed to get io clock\n");
> return PTR_ERR(pxa->clk_io);
> }
> pltfm_host->clk = pxa->clk_io;
> - clk_prepare_enable(pxa->clk_io);
>
> - pxa->clk_core = devm_clk_get(dev, "core");
> - if (!IS_ERR(pxa->clk_core))
> - clk_prepare_enable(pxa->clk_core);
> + pxa->clk_core = devm_clk_get_optional_enabled(dev, "core");
> + if (IS_ERR(pxa->clk_core))
> + return PTR_ERR(pxa->clk_core);
>
> host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY;
> /* enable 1/8V DDR capable */
> @@ -434,17 +433,17 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> if (device_is_compatible(dev, "marvell,armada-380-sdhci")) {
> ret = armada_38x_quirks(pdev, host);
> if (ret < 0)
> - goto err_mbus_win;
> + return ret;
> ret = mv_conf_mbus_windows(pdev, mv_mbus_dram_info());
> if (ret < 0)
> - goto err_mbus_win;
> + return ret;
> }
>
> match = of_match_device(of_match_ptr(sdhci_pxav3_of_match), &pdev->dev);
> if (match) {
> ret = mmc_of_parse(host->mmc);
> if (ret)
> - goto err_of_parse;
> + return ret;
> sdhci_get_of_property(pdev);
> pdata = pxav3_get_mmc_pdata(dev);
> pdev->dev.platform_data = pdata;
> @@ -499,27 +498,18 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
> err_add_host:
> pm_runtime_disable(&pdev->dev);
> pm_runtime_put_noidle(&pdev->dev);
> -err_of_parse:
> -err_mbus_win:
> - clk_disable_unprepare(pxa->clk_io);
> - clk_disable_unprepare(pxa->clk_core);
> return ret;
> }
>
> static void sdhci_pxav3_remove(struct platform_device *pdev)
> {
> struct sdhci_host *host = platform_get_drvdata(pdev);
> - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> - struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
>
> pm_runtime_get_sync(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
> pm_runtime_put_noidle(&pdev->dev);
>
> sdhci_remove_host(host, 1);
> -
> - clk_disable_unprepare(pxa->clk_io);
> - clk_disable_unprepare(pxa->clk_core);
> }
>
> static int sdhci_pxav3_suspend(struct device *dev)
> @@ -560,8 +550,7 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev)
> mmc_retune_needed(host->mmc);
>
> clk_disable_unprepare(pxa->clk_io);
> - if (!IS_ERR(pxa->clk_core))
> - clk_disable_unprepare(pxa->clk_core);
> + clk_disable_unprepare(pxa->clk_core);
>
> return 0;
> }
> @@ -571,10 +560,17 @@ static int sdhci_pxav3_runtime_resume(struct device *dev)
> struct sdhci_host *host = dev_get_drvdata(dev);
> struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> struct sdhci_pxa *pxa = sdhci_pltfm_priv(pltfm_host);
> + int ret;
>
> - clk_prepare_enable(pxa->clk_io);
> - if (!IS_ERR(pxa->clk_core))
> - clk_prepare_enable(pxa->clk_core);
> + ret = clk_prepare_enable(pxa->clk_io);
> + if (ret)
> + return ret;
> +
> + ret = clk_prepare_enable(pxa->clk_core);
> + if (ret) {
> + clk_disable_unprepare(pxa->clk_io);
> + return ret;
> + }
>
> sdhci_runtime_resume_host(host, 0);
> return 0;
> --
> 2.55.0
>
© 2016 - 2026 Red Hat, Inc.