@@ -224,7 +224,6 @@ struct spl2sw_common {
struct platform_device *pdev;
struct reset_control *rstc;
- struct clk *clk;
void *desc_base;
dma_addr_t desc_dma;
@@ -327,6 +327,7 @@ static int spl2sw_probe(struct platform_device *pdev)
struct net_device *ndev;
struct spl2sw_mac *mac;
u8 mac_addr[ETH_ALEN];
+ struct clk *clk;
int irq, i, ret;
if (platform_get_drvdata(pdev))
@@ -355,12 +356,12 @@ static int spl2sw_probe(struct platform_device *pdev)
return ret;
irq = ret;
- /* Get clock controller. */
- comm->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(comm->clk)) {
- dev_err_probe(&pdev->dev, PTR_ERR(comm->clk),
+ /* Get and enable clock controller. */
+ clk = devm_clk_get_enabled(&pdev->dev, NULL);
+ if (IS_ERR(clk)) {
+ dev_err_probe(&pdev->dev, PTR_ERR(clk),
"Failed to retrieve clock controller!\n");
- return PTR_ERR(comm->clk);
+ return PTR_ERR(clk);
}
/* Get reset controller. */
@@ -371,10 +372,6 @@ static int spl2sw_probe(struct platform_device *pdev)
return PTR_ERR(comm->rstc);
}
- /* Enable clock. */
- ret = clk_prepare_enable(comm->clk);
- if (ret)
- return ret;
udelay(1);
/* Reset MAC */
@@ -388,7 +385,7 @@ static int spl2sw_probe(struct platform_device *pdev)
dev_name(&pdev->dev), comm);
if (ret) {
dev_err(&pdev->dev, "Failed to request irq #%d!\n", irq);
- goto out_clk_disable;
+ return ret;
}
/* Initialize TX and RX descriptors. */
@@ -396,7 +393,7 @@ static int spl2sw_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "Fail to initialize mac descriptors!\n");
spl2sw_descs_free(comm);
- goto out_clk_disable;
+ return ret;
}
/* Initialize MAC. */
@@ -406,7 +403,7 @@ static int spl2sw_probe(struct platform_device *pdev)
ret = spl2sw_mdio_init(comm);
if (ret) {
dev_err(&pdev->dev, "Failed to initialize mdio bus!\n");
- goto out_clk_disable;
+ return ret;
}
/* Get child node ethernet-ports. */
@@ -506,8 +503,6 @@ static int spl2sw_probe(struct platform_device *pdev)
out_free_mdio:
spl2sw_mdio_remove(comm);
-out_clk_disable:
- clk_disable_unprepare(comm->clk);
return ret;
}
@@ -536,8 +531,6 @@ static void spl2sw_remove(struct platform_device *pdev)
netif_napi_del(&comm->tx_napi);
spl2sw_mdio_remove(comm);
-
- clk_disable_unprepare(comm->clk);
}
static const struct of_device_id spl2sw_of_match[] = {
Use devm_clk_get_enabled() instead of devm_clk_get() + clk_prepare_enable(), which can make the clk consistent with the device life cycle and reduce the risk of unreleased clk resources. Since the device framework has automatically released the clk resource, there is no need to execute clk_disable_unprepare(clk) on the error path, drop the out_clk_disable label, and the original error process can return directly. Some comments have also been adjusted. After this modification , it is no longer necessary to use clk, so delete the clk member of the spl2sw_common structure. Signed-off-by: Li Zetao <lizetao1@huawei.com> --- v1 -> v2: Delete the clk member of the spl2sw_common structure v1: https://lore.kernel.org/all/20240831021334.1907921-10-lizetao1@huawei.com/ drivers/net/ethernet/sunplus/spl2sw_define.h | 1 - drivers/net/ethernet/sunplus/spl2sw_driver.c | 25 +++++++------------- 2 files changed, 9 insertions(+), 17 deletions(-)