| Message ID | E1u4dKb-000dV7-3B@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next] net: stmmac: sun8i: use stmmac_pltfr_probe() | expand |
Hi Russell, On Tue, 15 Apr 2025 11:15:53 +0100 "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> wrote: > Using stmmac_pltfr_probe() simplifies the probe function. This will not > only call plat_dat->init (sun8i_dwmac_init), but also plat_dat->exit > (sun8i_dwmac_exit) appropriately if stmmac_dvr_probe() fails. This > results in an overall simplification of the glue driver. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Maxime
On Tue, Apr 15, 2025 at 11:15:53AM +0100, Russell King (Oracle) wrote: > Using stmmac_pltfr_probe() simplifies the probe function. This will not > only call plat_dat->init (sun8i_dwmac_init), but also plat_dat->exit > (sun8i_dwmac_exit) appropriately if stmmac_dvr_probe() fails. This > results in an overall simplification of the glue driver. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Le Tue, Apr 15, 2025 at 11:15:53AM +0100, Russell King (Oracle) a écrit : > Using stmmac_pltfr_probe() simplifies the probe function. This will not > only call plat_dat->init (sun8i_dwmac_init), but also plat_dat->exit > (sun8i_dwmac_exit) appropriately if stmmac_dvr_probe() fails. This > results in an overall simplification of the glue driver. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com> Tested-on: sun50i-h6-pine-h64 Tested-on: sun8i-a83t-bananapi-m3 Thanks
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 85723a78793a..fd6518e252e3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -1239,14 +1239,10 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) if (ret) return ret; - ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv); + ret = stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res); if (ret) goto dwmac_syscon; - ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); - if (ret) - goto dwmac_exit; - ndev = dev_get_drvdata(&pdev->dev); priv = netdev_priv(ndev); @@ -1283,9 +1279,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) clk_put(gmac->ephy_clk); dwmac_remove: pm_runtime_put_noidle(&pdev->dev); - stmmac_dvr_remove(&pdev->dev); -dwmac_exit: - sun8i_dwmac_exit(pdev, gmac); + stmmac_pltfr_remove(pdev); dwmac_syscon: sun8i_dwmac_unset_syscon(gmac);
Using stmmac_pltfr_probe() simplifies the probe function. This will not only call plat_dat->init (sun8i_dwmac_init), but also plat_dat->exit (sun8i_dwmac_exit) appropriately if stmmac_dvr_probe() fails. This results in an overall simplification of the glue driver. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)