]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: stmmac: sti: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
authorRaphael Gallais-Pou <rgallaispou@gmail.com>
Thu, 9 Jan 2025 15:58:42 +0000 (16:58 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 14 Jan 2025 03:01:59 +0000 (19:01 -0800)
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.

Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Yanteng Si <si.yanteng@linux.dev>
Link: https://patch.msgid.link/20250109155842.60798-1-rgallaispou@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

index eabc4da9e1a985101643908d2efdb0b4acaa9d60..de9b6dfef15b3d0a503a3b55b3e9a42ee68c6141 100644 (file)
@@ -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,
        },
 };