iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jisheng Zhang 2023-09-16 15:58:09 +08:00 committed by David S. Miller
parent 0485825dd6
commit d53b19d2a1
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
View File

@ -27,7 +27,7 @@ static int dwmac_generic_probe(struct platform_device *pdev)
return ret; return ret;
if (pdev->dev.of_node) { 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)) { if (IS_ERR(plat_dat)) {
dev_err(&pdev->dev, "dt configuration failed\n"); dev_err(&pdev->dev, "dt configuration failed\n");
return PTR_ERR(plat_dat); return PTR_ERR(plat_dat);
@ -46,17 +46,7 @@ static int dwmac_generic_probe(struct platform_device *pdev)
plat_dat->unicast_filter_entries = 1; plat_dat->unicast_filter_entries = 1;
} }
ret = stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res); return 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;
} }
static const struct of_device_id dwmac_generic_match[] = { 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 = { static struct platform_driver dwmac_generic_driver = {
.probe = dwmac_generic_probe, .probe = dwmac_generic_probe,
.remove_new = stmmac_pltfr_remove, .remove_new = stmmac_pltfr_remove_no_dt,
.driver = { .driver = {
.name = STMMAC_RESOURCE_NAME, .name = STMMAC_RESOURCE_NAME,
.pm = &stmmac_pltfr_pm_ops, .pm = &stmmac_pltfr_pm_ops,