]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
firmware: ti_sci: Replace ifdeffery by pm_sleep_ptr() macro
authorThomas Richard (TI.com) <thomas.richard@bootlin.com>
Tue, 14 Oct 2025 08:35:23 +0000 (10:35 +0200)
committerNishanth Menon <nm@ti.com>
Mon, 3 Nov 2025 15:08:53 +0000 (09:08 -0600)
Using pm_sleep_ptr() macro allows to remove ifdeffery and
'__maybe_unused' annotations.

Signed-off-by: Thomas Richard (TI.com) <thomas.richard@bootlin.com>
Link: https://patch.msgid.link/20251014-ti-sci-pm-ops-cleanup-v1-1-70b50b73ac85@bootlin.com
Signed-off-by: Nishanth Menon <nm@ti.com>
drivers/firmware/ti_sci.c

index 49fd2ae01055d0f425062147422471f0fd49e4bd..99a2e0e2960f463918950fef8829409ec365ce70 100644 (file)
@@ -3706,7 +3706,7 @@ static int ti_sci_prepare_system_suspend(struct ti_sci_info *info)
        }
 }
 
-static int __maybe_unused ti_sci_suspend(struct device *dev)
+static int ti_sci_suspend(struct device *dev)
 {
        struct ti_sci_info *info = dev_get_drvdata(dev);
        struct device *cpu_dev, *cpu_dev_max = NULL;
@@ -3746,7 +3746,7 @@ static int __maybe_unused ti_sci_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused ti_sci_suspend_noirq(struct device *dev)
+static int ti_sci_suspend_noirq(struct device *dev)
 {
        struct ti_sci_info *info = dev_get_drvdata(dev);
        int ret = 0;
@@ -3758,7 +3758,7 @@ static int __maybe_unused ti_sci_suspend_noirq(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused ti_sci_resume_noirq(struct device *dev)
+static int ti_sci_resume_noirq(struct device *dev)
 {
        struct ti_sci_info *info = dev_get_drvdata(dev);
        int ret = 0;
@@ -3780,7 +3780,7 @@ static int __maybe_unused ti_sci_resume_noirq(struct device *dev)
        return 0;
 }
 
-static void __maybe_unused ti_sci_pm_complete(struct device *dev)
+static void ti_sci_pm_complete(struct device *dev)
 {
        struct ti_sci_info *info = dev_get_drvdata(dev);
 
@@ -3791,12 +3791,10 @@ static void __maybe_unused ti_sci_pm_complete(struct device *dev)
 }
 
 static const struct dev_pm_ops ti_sci_pm_ops = {
-#ifdef CONFIG_PM_SLEEP
-       .suspend = ti_sci_suspend,
-       .suspend_noirq = ti_sci_suspend_noirq,
-       .resume_noirq = ti_sci_resume_noirq,
-       .complete = ti_sci_pm_complete,
-#endif
+       .suspend = pm_sleep_ptr(ti_sci_suspend),
+       .suspend_noirq = pm_sleep_ptr(ti_sci_suspend_noirq),
+       .resume_noirq = pm_sleep_ptr(ti_sci_resume_noirq),
+       .complete = pm_sleep_ptr(ti_sci_pm_complete),
 };
 
 /* Description for K2G */