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

net: stmmac: dwmac-generic: 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 0485825d

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

+3 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int dwmac_generic_probe(struct platform_device *pdev) 
		return ret;



	if (pdev->dev.of_node) {

		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)) {

			dev_err(&pdev->dev, "dt configuration failed\n");

			return PTR_ERR(plat_dat);
@@ -46,17 +46,7 @@ static int dwmac_generic_probe(struct platform_device *pdev) 
		plat_dat->unicast_filter_entries = 1;

	}



	ret = stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

	if (ret)

		goto err_remove_config_dt;



	return 0;



err_remove_config_dt:

	if (pdev->dev.of_node)

		stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

	return stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

}



static const struct of_device_id dwmac_generic_match[] = {
@@ -77,7 +67,7 @@ MODULE_DEVICE_TABLE(of, dwmac_generic_match); 


static struct platform_driver dwmac_generic_driver = {

	.probe  = dwmac_generic_probe,

	.remove_new = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove_no_dt,

	.driver = {

		.name           = STMMAC_RESOURCE_NAME,

		.pm		= &stmmac_pltfr_pm_ops,