net: stmmac: ingenic: cleanups
Subsystems (4)
cover net: stmmac: ingenic: cleanups
Hi,
Another series for another stmmac glue platform.
Convert Ingenic to use the stmmac platform PM ops and the devm_stmmac_pltfr_probe() helper.
.../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 46 ++++------------------ 1 file changed, 8 insertions(+), 38 deletions(-)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
PATCH 1/2 net: stmmac: ingenic: convert to stmmac_pltfr_pm_ops
Convert the Ingenic glue driver to use the generic stmmac platform power management operations.
In order to do this, we need to make ingenic_mac_init() arguments compatible with plat_dat->init() by adding a plat_dat member to struct ingenic_mac. This allows the custom suspend/resume operations to be removed, and the PM ops pointer replaced with stmmac_pltfr_pm_ops.
This will adds runtime PM and noirq suspend/resume ops to this driver.
--- .../ethernet/stmicro/stmmac/dwmac-ingenic.c | 41 ++++--------------- 1 file changed, 8 insertions(+), 33 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c +8 -33
@@ -56,6 +56,7 @@ enum ingenic_mac_version {struct ingenic_mac {const struct ingenic_soc_info *soc_info; +struct plat_stmmacenet_data *plat_dat;struct device *dev;struct regmap *regmap;
@@ -70,13 +71,13 @@ struct ingenic_soc_info {int (*set_mode)(struct plat_stmmacenet_data *plat_dat); }; -static int ingenic_mac_init (struct plat_stmmacenet_data *plat_dat) +static int ingenic_mac_init (struct platform_device *pdev,void *bsp_priv) { -struct ingenic_mac *mac = plat_dat->bsp_priv; +struct ingenic_mac *mac = bsp_priv;int ret;if (mac->soc_info->set_mode) { - ret = mac->soc_info->set_mode (plat_dat); + ret = mac->soc_info->set_mode (mac->plat_dat);if (ret)return ret; }
@@ -284,44 +285,18 @@ static int ingenic_mac_probe(struct platform_device *pdev) mac->soc_info = data; mac->dev = &pdev->dev; + mac->plat_dat = plat_dat; plat_dat->bsp_priv = mac; + plat_dat->init = ingenic_mac_init; - ret =ingenic_mac_init (plat_dat); + ret =ingenic_mac_init (pdev, mac);if (ret)return ret;return stmmac_dvr_probe (&pdev->dev, plat_dat, &stmmac_res); } -#ifdef CONFIG_PM_SLEEP -static int ingenic_mac_suspend (struct device *dev) -{ -int ret; - - ret =stmmac_suspend (dev); - -return ret; -} - -static int ingenic_mac_resume (struct device *dev) -{ -struct net_device *ndev =dev_get_drvdata (dev); -struct stmmac_priv *priv =netdev_priv (ndev); -int ret; - - ret =ingenic_mac_init (priv->plat); -if (ret) -return ret; - - ret =stmmac_resume (dev); - -return ret; -} -#endif /* CONFIG_PM_SLEEP */ - -static SIMPLE_DEV_PM_OPS(ingenic_mac_pm_ops, ingenic_mac_suspend, ingenic_mac_resume); -static struct ingenic_soc_info jz4775_soc_info = { .version =ID_JZ4775 , .mask =MACPHYC_TXCLK_SEL_MASK |MACPHYC_SOFT_RST_MASK |MACPHYC_PHY_INFT_MASK ,
@@ -373,7 +348,7 @@ static struct platform_driver ingenic_mac_driver = { .remove = stmmac_pltfr_remove, .driver = { .name = "ingenic-mac", - .pm = pm_ptr(&ingenic_mac_pm_ops), + .pm = &stmmac_pltfr_pm_ops, .of_match_table = ingenic_mac_of_matches, }, };
Signature · 1 line
2.30.2
Re: [PATCH net-next 1/2] net: stmmac: ingenic: convert to stmmac_pltfr_pm_ops
Quoted 11 lines · Russell King (Oracle)
Convert the Ingenic glue driver to use the generic stmmac platform power management operations.
In order to do this, we need to make
ingenic_mac_init()arguments compatible withplat_dat->init()by adding aplat_datmember to structingenic_mac. This allows the custom suspend/resume operations to be removed, and the PM ops pointer replaced withstmmac_pltfr_pm_ops.This will adds runtime PM and noirq suspend/resume ops to this driver.
Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 2/2 net: stmmac: ingenic: convert to devm_stmmac_pltfr_probe()
In reply to Russell King (Oracle)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().
--- drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c +1 -6
@@ -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,
Signature · 1 line
2.30.2
Re: [PATCH net-next 2/2] net: stmmac: ingenic: convert to devm_stmmac_pltfr_probe()
Quoted 8 lines · Russell King (Oracle)
As Ingenic now uses the stmmac platform PM ops, convert it to use
devm_stmmac_pltfr_probe()which will call theplat_dat->init()method beforestmmac_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 tostmmac_pltfr_remove().Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Mon, 14 Apr 2025 16:51:18 +0100 you wrote:
Hi,
Another series for another stmmac glue platform.
Convert Ingenic to use the stmmac platform PM ops and the
devm_stmmac_pltfr_probe()helper.[...]
Here is the summary with links:
- [net-next,1/2] net: stmmac: ingenic: convert to stmmac_pltfr_pm_ops
https://git.kernel.org/netdev/net-next/c/debfcb3f5848 - [net-next,2/2] net: stmmac: ingenic: convert to devm_stmmac_pltfr_probe() https://git.kernel.org/netdev/net-next/c/96f8bf85d11a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html