Commit 6d6c1193 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by David S. Miller
Browse files

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



Simplify the driver's probe() function by using the devres
variant of stmmac_probe_config_dt().

The remove_new() callback 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 9086d3f2

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

+3 −9
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int starfive_dwmac_probe(struct platform_device *pdev) 
		return dev_err_probe(&pdev->dev, err,

				     "failed to get resources\n");



	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 dev_err_probe(&pdev->dev, PTR_ERR(plat_dat),

				     "dt configuration failed\n");
@@ -141,13 +141,7 @@ static int starfive_dwmac_probe(struct platform_device *pdev) 
	if (err)

		return err;



	err = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (err) {

		stmmac_remove_config_dt(pdev, plat_dat);

		return err;

	}



	return 0;

	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

}



static const struct of_device_id starfive_dwmac_match[] = {
@@ -158,7 +152,7 @@ MODULE_DEVICE_TABLE(of, starfive_dwmac_match); 


static struct platform_driver starfive_dwmac_driver = {

	.probe  = starfive_dwmac_probe,

	.remove_new = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove_no_dt,

	.driver = {

		.name = "starfive-dwmac",

		.pm = &stmmac_pltfr_pm_ops,