github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ata: sata_mv: use devm clock helpers

Browse Source 
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>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
This commit is contained in:
Rosen Penev 2026-07-12 15:37:33 -07:00 committed by Damien Le Moal
parent 692a964305
commit 427ac6f5ff
1 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/ata/sata_mv.c
View File

@ -4088,21 +4088,19 @@ 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])) {
rc = PTR_ERR(hpriv->port_clks[port]);
hpriv->n_ports = port;
goto err;
}
sprintf(port_number, "port%d", port);
hpriv->port_phys[port] = devm_phy_optional_get(&pdev->dev,
@ -4116,8 +4114,8 @@ 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]);
}
phy_power_on(hpriv->port_phys[port]);
}
/* All the ports have been initialized */
@ -4156,17 +4154,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;
}
@ -4186,17 +4175,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