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

net: stmmac: socfpga: convert to devm_stmmac_pltfr_probe() 



Convert socfpga to use devm_stmmac_pltfr_probe() to further simplify
the probe function, wrapping the call to the set_phy_mode() method
into socfpga_dwmac_init() which can be called from the plat_dat->init()
method. Also call this from socfpga_dwmac_resume() thereby simplifying
that function.

Using the devm variant also means we can remove the call to
stmmac_pltfr_remove().

Unfortunately, we can't also convert to stmmac_pltfr_pm_ops as there is
extra work done in socfpga_dwmac_resume().

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1u5Sns-001IJw-OY@rmk-PC.armlinux.org.uk


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

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

+1 −6
Original line number Diff line number Diff line
@@ -500,11 +500,7 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) 


	plat_dat->riwt_off = 1;



	ret = socfpga_dwmac_init(pdev, dwmac);

	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 const struct socfpga_dwmac_ops socfpga_gen5_ops = {
@@ -524,7 +520,6 @@ MODULE_DEVICE_TABLE(of, socfpga_dwmac_match); 


static struct platform_driver socfpga_dwmac_driver = {

	.probe  = socfpga_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.driver = {

		.name           = "socfpga-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,