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

net: stmmac: imx: use stmmac_pltfr_probe() 



Using stmmac_pltfr_probe() simplifies the probe function. This will not
only call plat_dat->init (imx_dwmac_init), but also plat_dat->exit
(imx_dwmac_exit) appropriately if stmmac_dvr_probe() fails. This
results in an overall simplification of the glue driver.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1u4Flp-000XlM-Tb@rmk-PC.armlinux.org.uk


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

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

+2 −12
Original line number Diff line number Diff line
@@ -379,10 +379,6 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	ret = imx_dwmac_init(pdev, dwmac);

	if (ret)

		goto err_dwmac_init;



	if (dwmac->ops->fix_mac_speed) {

		plat_dat->fix_mac_speed = dwmac->ops->fix_mac_speed;

	} else if (!dwmac->ops->mac_rgmii_txclk_auto_adj) {
@@ -392,16 +388,10 @@ static int imx_dwmac_probe(struct platform_device *pdev) 


	dwmac->plat_dat->fix_soc_reset = dwmac->ops->fix_soc_reset;



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

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

	if (ret)

		goto err_drv_probe;



	return 0;



err_drv_probe:

	imx_dwmac_exit(pdev, plat_dat->bsp_priv);

err_dwmac_init:

		imx_dwmac_clks_config(dwmac, false);



	return ret;

}