Commit d336a117 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by David S. Miller

net: stmmac: dwmac-visconti: use devm_stmmac_probe_config_dt()

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: default avatarJisheng Zhang <jszhang@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acf73ccf
...@@ -220,15 +220,13 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev) ...@@ -220,15 +220,13 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)
if (ret) if (ret)
return 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)) if (IS_ERR(plat_dat))
return PTR_ERR(plat_dat); return PTR_ERR(plat_dat);
dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL); dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
if (!dwmac) { if (!dwmac)
ret = -ENOMEM; return -ENOMEM;
goto remove_config;
}
spin_lock_init(&dwmac->lock); spin_lock_init(&dwmac->lock);
dwmac->reg = stmmac_res.addr; dwmac->reg = stmmac_res.addr;
...@@ -238,7 +236,7 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev) ...@@ -238,7 +236,7 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)
ret = visconti_eth_clock_probe(pdev, plat_dat); ret = visconti_eth_clock_probe(pdev, plat_dat);
if (ret) if (ret)
goto remove_config; return ret;
visconti_eth_init_hw(pdev, plat_dat); visconti_eth_init_hw(pdev, plat_dat);
...@@ -252,22 +250,15 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev) ...@@ -252,22 +250,15 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)
remove: remove:
visconti_eth_clock_remove(pdev); visconti_eth_clock_remove(pdev);
remove_config:
stmmac_remove_config_dt(pdev, plat_dat);
return ret; return ret;
} }
static void visconti_eth_dwmac_remove(struct platform_device *pdev) static void visconti_eth_dwmac_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); stmmac_pltfr_remove_no_dt(pdev);
struct stmmac_priv *priv = netdev_priv(ndev);
stmmac_pltfr_remove(pdev);
visconti_eth_clock_remove(pdev); visconti_eth_clock_remove(pdev);
stmmac_remove_config_dt(pdev, priv->plat);
} }
static const struct of_device_id visconti_eth_dwmac_match[] = { static const struct of_device_id visconti_eth_dwmac_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment