Skip to content

Commit

Permalink
net: stmmac: dwmac-visconti: 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>
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 acf73cc commit d336a11
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,13 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)
if (ret)
return ret;

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);

dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
if (!dwmac) {
ret = -ENOMEM;
goto remove_config;
}
if (!dwmac)
return -ENOMEM;

spin_lock_init(&dwmac->lock);
dwmac->reg = stmmac_res.addr;
Expand All @@ -238,7 +236,7 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)

ret = visconti_eth_clock_probe(pdev, plat_dat);
if (ret)
goto remove_config;
return ret;

visconti_eth_init_hw(pdev, plat_dat);

Expand All @@ -252,22 +250,15 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)

remove:
visconti_eth_clock_remove(pdev);
remove_config:
stmmac_remove_config_dt(pdev, plat_dat);

return ret;
}

static void visconti_eth_dwmac_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct stmmac_priv *priv = netdev_priv(ndev);

stmmac_pltfr_remove(pdev);
stmmac_pltfr_remove_no_dt(pdev);

visconti_eth_clock_remove(pdev);

stmmac_remove_config_dt(pdev, priv->plat);
}

static const struct of_device_id visconti_eth_dwmac_match[] = {
Expand Down

0 comments on commit d336a11

Please sign in to comment.