Commit 9bdf6909 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by David S. Miller
Browse files

net: stmmac: dwmac-sun8i: 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>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37384515

drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c

+3 −5
Original line number Diff line number Diff line
@@ -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);
@@ -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)
@@ -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;

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

}