Skip to content

Commit

Permalink
net: stmmac: dwmac-sun8i: use devm_stmmac_probe_config_dt()
Browse files Browse the repository at this point in the history
Simplify the driver's probe() function by using the devres
variant of stmmac_probe_config_dt().

The calling of stmmac_pltfr_remove() now needs to be switched to
stmmac_pltfr_remove_no_dt().

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jisheng Zhang authored and David S. Miller committed Sep 18, 2023
1 parent 3738451 commit 9bdf690
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
if (ret)
return -EINVAL;

plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);
if (IS_ERR(plat_dat))
return PTR_ERR(plat_dat);

Expand All @@ -1244,7 +1244,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)

ret = sun8i_dwmac_set_syscon(&pdev->dev, plat_dat);
if (ret)
goto dwmac_deconfig;
return ret;

ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv);
if (ret)
Expand Down Expand Up @@ -1295,8 +1295,6 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
sun8i_dwmac_exit(pdev, gmac);
dwmac_syscon:
sun8i_dwmac_unset_syscon(gmac);
dwmac_deconfig:
stmmac_remove_config_dt(pdev, plat_dat);

return ret;
}
Expand All @@ -1314,7 +1312,7 @@ static void sun8i_dwmac_remove(struct platform_device *pdev)
clk_put(gmac->ephy_clk);
}

stmmac_pltfr_remove(pdev);
stmmac_pltfr_remove_no_dt(pdev);
sun8i_dwmac_unset_syscon(gmac);
}

Expand Down

0 comments on commit 9bdf690

Please sign in to comment.