net: stmmac: sti: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
Subsystems (4)
PATCH v2 1/1 net: stmmac: sti: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards.
---
Changes in v2:
- Split serie in single patches
- Remove irrelevant 'Link:' from commit log
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +3 -5
@@ -313,7 +313,6 @@ static void sti_dwmac_remove(struct platform_device *pdev)clk_disable_unprepare (dwmac->clk); } -#ifdef CONFIG_PM_SLEEP static int sti_dwmac_suspend (struct device *dev) {struct sti_dwmac *dwmac =get_stmmac_bsp_priv (dev);
@@ -333,10 +332,9 @@ static int sti_dwmac_resume(struct device *dev)return stmmac_resume (dev); } -#endif /* CONFIG_PM_SLEEP */ -static SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend, - sti_dwmac_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend, + sti_dwmac_resume);static const struct sti_dwmac_of_data stih4xx_dwmac_data = { .fix_retime_src = stih4xx_fix_retime_src,
@@ -353,7 +351,7 @@ static struct platform_driver sti_dwmac_driver = { .remove = sti_dwmac_remove, .driver = { .name = "sti-dwmac", - .pm = &sti_dwmac_pm_ops, + .pm = pm_sleep_ptr(&sti_dwmac_pm_ops), .of_match_table = sti_dwmac_match, }, };
Signature · 1 line
2.47.1
Quoted 10 lines · Raphael Gallais-Pou
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less error prone than the use of #ifdef based kernel configuration guards.Signed-off-by Raphael Gallais-Pou <[email protected]>---
Changes in v2:
- Split serie in single patches
- Remove irrelevant 'Link:' from commit log
- Link to v1: https://lore.kernel.org/r/[email protected]
Quoted 5 lines · Raphael Gallais-Pou
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less error prone than the use of #ifdef based kernel configuration guards.Signed-off-by Raphael Gallais-Pou <[email protected]>
LGTM!
Thanks,
Yanteng
Quoted 43 lines
---
Changes in v2:
- Split serie in single patches
- Remove irrelevant 'Link:' from commit log
- Link to v1: https://lore.kernel.org/r/[email protected]--- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c +3
-5@@ -313,7 +313,6 @@ static void sti_dwmac_remove(struct platform_device *pdev)clk_disable_unprepare (dwmac->clk); } -#ifdef CONFIG_PM_SLEEP static int sti_dwmac_suspend (struct device *dev) {struct sti_dwmac *dwmac =get_stmmac_bsp_priv (dev);@@ -333,10 +332,9 @@ static int sti_dwmac_resume(struct device *dev)return stmmac_resume (dev); } -#endif /* CONFIG_PM_SLEEP */ -static SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend, - sti_dwmac_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend, + sti_dwmac_resume);static const struct sti_dwmac_of_data stih4xx_dwmac_data = { .fix_retime_src = stih4xx_fix_retime_src,@@ -353,7 +351,7 @@ static struct platform_driver sti_dwmac_driver = { .remove = sti_dwmac_remove, .driver = { .name = "sti-dwmac", - .pm = &sti_dwmac_pm_ops, + .pm = pm_sleep_ptr(&sti_dwmac_pm_ops), .of_match_table = sti_dwmac_match, }, };
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 4 lines · On Thu, 9 Jan 2025 16:58:42 +0100 you wrote:
Letting the compiler remove these functions when the kernel is built without
CONFIG_PM_SLEEPsupport is simpler and less error prone than the use of #ifdef based kernel configuration guards.
Quoted 8 lines
Signed-off-by Raphael Gallais-Pou <[email protected]>---
Changes in v2:
- Split serie in single patches
- Remove irrelevant 'Link:' from commit log
- Link to v1: https://lore.kernel.org/r/[email protected][...]
Here is the summary with links:
- [v2] net: stmmac: sti: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
https://git.kernel.org/netdev/net-next/c/6e702e6aba84
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html