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

net: stmmac: ingenic: convert to devm_stmmac_pltfr_probe() 



As Ingenic now uses the stmmac platform PM ops, convert it to use
devm_stmmac_pltfr_probe() which will call the plat_dat->init() method
before stmmac_drv_probe() and appropriately cleaning up via the
->exit() method, thus simplifying the code. Using the devm_*()
variant also allows removal of the explicit call to
stmmac_pltfr_remove().

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


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

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

+1 −6
Original line number Diff line number Diff line
@@ -290,11 +290,7 @@ static int ingenic_mac_probe(struct platform_device *pdev) 
	plat_dat->bsp_priv = mac;

	plat_dat->init = ingenic_mac_init;



	ret = ingenic_mac_init(pdev, mac);

	if (ret)

		return ret;



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

	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

}



static struct ingenic_soc_info jz4775_soc_info = {
@@ -345,7 +341,6 @@ MODULE_DEVICE_TABLE(of, ingenic_mac_of_matches); 


static struct platform_driver ingenic_mac_driver = {

	.probe		= ingenic_mac_probe,

	.remove		= stmmac_pltfr_remove,

	.driver		= {

		.name	= "ingenic-mac",

		.pm		= &stmmac_pltfr_pm_ops,