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

net: stmmac: dwmac-meson: 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 d7209c05

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

+7 −20
Original line number Diff line number Diff line
@@ -52,35 +52,22 @@ static int meson6_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);



	dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);

	if (!dwmac) {

		ret = -ENOMEM;

		goto err_remove_config_dt;

	}

	if (!dwmac)

		return -ENOMEM;



	dwmac->reg = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(dwmac->reg)) {

		ret = PTR_ERR(dwmac->reg);

		goto err_remove_config_dt;

	}

	if (IS_ERR(dwmac->reg))

		return PTR_ERR(dwmac->reg);



	plat_dat->bsp_priv = dwmac;

	plat_dat->fix_mac_speed = meson6_dwmac_fix_mac_speed;



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

	if (ret)

		goto err_remove_config_dt;



	return 0;



err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

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

}



static const struct of_device_id meson6_dwmac_match[] = {
@@ -91,7 +78,7 @@ MODULE_DEVICE_TABLE(of, meson6_dwmac_match); 


static struct platform_driver meson6_dwmac_driver = {

	.probe  = meson6_dwmac_probe,

	.remove_new = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove_no_dt,

	.driver = {

		.name           = "meson6-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,