Commit 4cc8b577 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: sun8i: use stmmac_pltfr_probe() 



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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Link: https://patch.msgid.link/E1u4dKb-000dV7-3B@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 978d13b2

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

+2 −8
Original line number Diff line number Diff line
@@ -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);