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

net: stmmac: dwmac-mediatek: 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 d30c08a3

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

+3 −5
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static int mediatek_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);
@@ -665,7 +665,7 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) 


	ret = mediatek_dwmac_clks_config(priv_plat, true);

	if (ret)

		goto err_remove_config_dt;

		return ret;



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

	if (ret)
@@ -675,8 +675,6 @@ static int mediatek_dwmac_probe(struct platform_device *pdev) 


err_drv_probe:

	mediatek_dwmac_clks_config(priv_plat, false);

err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

}
@@ -685,7 +683,7 @@ static void mediatek_dwmac_remove(struct platform_device *pdev) 
{

	struct mediatek_dwmac_plat_data *priv_plat = get_stmmac_bsp_priv(&pdev->dev);



	stmmac_pltfr_remove(pdev);

	stmmac_pltfr_remove_no_dt(pdev);

	mediatek_dwmac_clks_config(priv_plat, false);

}