[PATCH] ata: sata_mv: use devm clock helpers

[PATCH] ata: sata_mv: use devm clock helpers

[Rosen Penev]

Replace clk_get/clk_prepare_enable/clk_put with
devm_clk_get_optional_enabled for both the main clock and
per-port clocks. This eliminates the need for manual clock
cleanup in probe error and remove paths.

The err label is retained for phy_power_off cleanup, since
devm_phy_optional_get does not manage phy power state.

Assisted-by: opencode:big-pickle
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/ata/sata_mv.c | 45 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index ecf1653321e5..fdd86573a823 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4090,21 +4090,16 @@ static int mv_platform_probe(struct platform_device *pdev)
 
 	hpriv->base -= SATAHC0_REG_BASE;
 
-	hpriv->clk = clk_get(&pdev->dev, NULL);
-	if (IS_ERR(hpriv->clk)) {
-		dev_notice(&pdev->dev, "cannot get optional clkdev\n");
-	} else {
-		rc = clk_prepare_enable(hpriv->clk);
-		if (rc)
-			goto err;
-	}
+	hpriv->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
+	if (IS_ERR(hpriv->clk))
+		return PTR_ERR(hpriv->clk);
 
 	for (port = 0; port < n_ports; port++) {
 		char port_number[16];
 		sprintf(port_number, "%d", port);
-		hpriv->port_clks[port] = clk_get(&pdev->dev, port_number);
-		if (!IS_ERR(hpriv->port_clks[port]))
-			clk_prepare_enable(hpriv->port_clks[port]);
+		hpriv->port_clks[port] = devm_clk_get_optional_enabled(&pdev->dev, port_number);
+		if (IS_ERR(hpriv->port_clks[port]))
+			return PTR_ERR(hpriv->port_clks[port]);
 
 		sprintf(port_number, "port%d", port);
 		hpriv->port_phys[port] = devm_phy_optional_get(&pdev->dev,
@@ -4117,9 +4112,9 @@ static int mv_platform_probe(struct platform_device *pdev)
 
 			/* Cleanup only the initialized ports */
 			hpriv->n_ports = port;
-			goto err;
-		} else
-			phy_power_on(hpriv->port_phys[port]);
+			return rc;
+		}
+		phy_power_on(hpriv->port_phys[port]);
 	}
 
 	/* All the ports have been initialized */
@@ -4158,17 +4153,8 @@ static int mv_platform_probe(struct platform_device *pdev)
 		return 0;
 
 err:
-	if (!IS_ERR(hpriv->clk)) {
-		clk_disable_unprepare(hpriv->clk);
-		clk_put(hpriv->clk);
-	}
-	for (port = 0; port < hpriv->n_ports; port++) {
-		if (!IS_ERR(hpriv->port_clks[port])) {
-			clk_disable_unprepare(hpriv->port_clks[port]);
-			clk_put(hpriv->port_clks[port]);
-		}
+	for (port = 0; port < hpriv->n_ports; port++)
 		phy_power_off(hpriv->port_phys[port]);
-	}
 
 	return rc;
 }
@@ -4188,17 +4174,8 @@ static void mv_platform_remove(struct platform_device *pdev)
 	int port;
 	ata_host_detach(host);
 
-	if (!IS_ERR(hpriv->clk)) {
-		clk_disable_unprepare(hpriv->clk);
-		clk_put(hpriv->clk);
-	}
-	for (port = 0; port < host->n_ports; port++) {
-		if (!IS_ERR(hpriv->port_clks[port])) {
-			clk_disable_unprepare(hpriv->port_clks[port]);
-			clk_put(hpriv->port_clks[port]);
-		}
+	for (port = 0; port < host->n_ports; port++)
 		phy_power_off(hpriv->port_phys[port]);
-	}
 }
 
 #ifdef CONFIG_PM_SLEEP
-- 
2.54.0

Re: [PATCH] ata: sata_mv: use devm clock helpers

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Direct returns inside the per-port initialization loop bypass the `err` cleanup block, leaking the power state of previously initialized PHYs.
--

commit 6348b987b12e84df8076e5646462dde25b2d8234
Author: Rosen Penev <rosenp@gmail.com>

ata: sata_mv: use devm clock helpers

This commit replaces manual clock management with devm_clk_get_optional_enabled
for the main and per-port clocks. The commit message states the err label is
retained for phy_power_off cleanup.

> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c

[ ... ]

> @@ -4091,21 +4091,16 @@ static int mv_platform_probe(struct platform_device *pdev)

[ ... ]

>  	for (port = 0; port < n_ports; port++) {
>  		char port_number[16];
>  		sprintf(port_number, "%d", port);
> -		hpriv->port_clks[port] = clk_get(&pdev->dev, port_number);
> -		if (!IS_ERR(hpriv->port_clks[port]))
> -			clk_prepare_enable(hpriv->port_clks[port]);
> +		hpriv->port_clks[port] = devm_clk_get_optional_enabled(&pdev->dev, port_number);
> +		if (IS_ERR(hpriv->port_clks[port]))
> +			return PTR_ERR(hpriv->port_clks[port]);

[Severity: High]
Does this direct return skip the cleanup for PHYs powered on during previous
loop iterations?

If mv_platform_probe() fails to get the port clock on a subsequent port
(port > 0), returning directly bypasses the err label where phy_power_off()
is called. This could leave the earlier PHYs powered on.

>  		sprintf(port_number, "port%d", port);
>  		hpriv->port_phys[port] = devm_phy_optional_get(&pdev->dev,
> @@ -4118,9 +4113,9 @@ static int mv_platform_probe(struct platform_device *pdev)
>  
>  			/* Cleanup only the initialized ports */
>  			hpriv->n_ports = port;
> -			goto err;
> -		} else
> -			phy_power_on(hpriv->port_phys[port]);
> +			return rc;
> +		}

[Severity: High]
Is it intentional to replace the goto err with a direct return here?

The original code used goto err to ensure phy_power_off() would be called for
previously initialized ports when devm_phy_optional_get() failed. By
returning directly, could this leak the power state if probe is deferred
or fails for a later port?

> +		phy_power_on(hpriv->port_phys[port]);
>  	}

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260610063512.109464-1-rosenp@gmail.com?part=1