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

net: stmmac: dwmac-anarion: 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 e8535bfb

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

+3 −9
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int anarion_dwmac_probe(struct platform_device *pdev) 
	if (IS_ERR(gmac))

		return PTR_ERR(gmac);



	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);
@@ -124,13 +124,7 @@ static int anarion_dwmac_probe(struct platform_device *pdev) 
	anarion_gmac_init(pdev, gmac);

	plat_dat->bsp_priv = gmac;



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

	if (ret) {

		stmmac_remove_config_dt(pdev, plat_dat);

		return ret;

	}



	return 0;

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

}



static const struct of_device_id anarion_dwmac_match[] = {
@@ -141,7 +135,7 @@ MODULE_DEVICE_TABLE(of, anarion_dwmac_match); 


static struct platform_driver anarion_dwmac_driver = {

	.probe  = anarion_dwmac_probe,

	.remove_new = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove_no_dt,

	.driver = {

		.name           = "anarion-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,