PM: sleep: Introduce CALL_PM_OP() macro to simplify code

kaushlen · rafaeljw · commit 5a151c2328a7 · 2025-10-20T19:54:25.000+02:00
Add CALL_PM_OP() macro to eliminate a repetitive code pattern in power management generic operations. Replace analogous driver PM callback invocation logic across all pm_generic_*() functions with a single macro that handles the NULL pointer checks and function calls. This reduces code size while maintaining the same functionality and improving code maintainability. Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com> Reviewed-by: Dhruva Gole <d-gole@ti.com> Link: https://patch.msgid.link/20250919124437.3075016-1-kaushlendra.kumar@intel.com [ rjw: Subject and changelog edits, adjust white space ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
@@ -8,6 +8,13 @@
 #include <linux/pm_runtime.h>
 #include <linux/export.h>
 
+#define CALL_PM_OP(dev, op) \
+({ \
+	struct device *_dev = (dev); \
+	const struct dev_pm_ops *pm = _dev->driver ? _dev->driver->pm : NULL; \
+	pm && pm->op ? pm->op(_dev) : 0; \
+})
+
 #ifdef CONFIG_PM
 /**
  * pm_generic_runtime_suspend - Generic runtime suspend callback for subsystems.
@@ -19,12 +26,7 @@
  */
 int pm_generic_runtime_suspend(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-	int ret;
-
-	ret = pm && pm->runtime_suspend ? pm->runtime_suspend(dev) : 0;
-
-	return ret;
+	return CALL_PM_OP(dev, runtime_suspend);
 }
 EXPORT_SYMBOL_GPL(pm_generic_runtime_suspend);
 
@@ -38,12 +40,7 @@ EXPORT_SYMBOL_GPL(pm_generic_runtime_suspend);
  */
 int pm_generic_runtime_resume(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-	int ret;
-
-	ret = pm && pm->runtime_resume ? pm->runtime_resume(dev) : 0;
-
-	return ret;
+	return CALL_PM_OP(dev, runtime_resume);
 }
 EXPORT_SYMBOL_GPL(pm_generic_runtime_resume);
 #endif /* CONFIG_PM */
@@ -72,9 +69,7 @@ int pm_generic_prepare(struct device *dev)
  */
 int pm_generic_suspend_noirq(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->suspend_noirq ? pm->suspend_noirq(dev) : 0;
+	return CALL_PM_OP(dev, suspend_noirq);
 }
 EXPORT_SYMBOL_GPL(pm_generic_suspend_noirq);
 
@@ -84,9 +79,7 @@ EXPORT_SYMBOL_GPL(pm_generic_suspend_noirq);
  */
 int pm_generic_suspend_late(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->suspend_late ? pm->suspend_late(dev) : 0;
+	return CALL_PM_OP(dev, suspend_late);
 }
 EXPORT_SYMBOL_GPL(pm_generic_suspend_late);
 
@@ -96,9 +89,7 @@ EXPORT_SYMBOL_GPL(pm_generic_suspend_late);
  */
 int pm_generic_suspend(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->suspend ? pm->suspend(dev) : 0;
+	return CALL_PM_OP(dev, suspend);
 }
 EXPORT_SYMBOL_GPL(pm_generic_suspend);
 
@@ -108,9 +99,7 @@ EXPORT_SYMBOL_GPL(pm_generic_suspend);
  */
 int pm_generic_freeze_noirq(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->freeze_noirq ? pm->freeze_noirq(dev) : 0;
+	return CALL_PM_OP(dev, freeze_noirq);
 }
 EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq);
 
@@ -120,9 +109,7 @@ EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq);
  */
 int pm_generic_freeze(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->freeze ? pm->freeze(dev) : 0;
+	return CALL_PM_OP(dev, freeze);
 }
 EXPORT_SYMBOL_GPL(pm_generic_freeze);
 
@@ -132,9 +119,7 @@ EXPORT_SYMBOL_GPL(pm_generic_freeze);
  */
 int pm_generic_poweroff_noirq(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->poweroff_noirq ? pm->poweroff_noirq(dev) : 0;
+	return CALL_PM_OP(dev, poweroff_noirq);
 }
 EXPORT_SYMBOL_GPL(pm_generic_poweroff_noirq);
 
@@ -144,9 +129,7 @@ EXPORT_SYMBOL_GPL(pm_generic_poweroff_noirq);
  */
 int pm_generic_poweroff_late(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->poweroff_late ? pm->poweroff_late(dev) : 0;
+	return CALL_PM_OP(dev, poweroff_late);
 }
 EXPORT_SYMBOL_GPL(pm_generic_poweroff_late);
 
@@ -156,9 +139,7 @@ EXPORT_SYMBOL_GPL(pm_generic_poweroff_late);
  */
 int pm_generic_poweroff(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->poweroff ? pm->poweroff(dev) : 0;
+	return CALL_PM_OP(dev, poweroff);
 }
 EXPORT_SYMBOL_GPL(pm_generic_poweroff);
 
@@ -168,9 +149,7 @@ EXPORT_SYMBOL_GPL(pm_generic_poweroff);
  */
 int pm_generic_thaw_noirq(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->thaw_noirq ? pm->thaw_noirq(dev) : 0;
+	return CALL_PM_OP(dev, thaw_noirq);
 }
 EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq);
 
@@ -180,9 +159,7 @@ EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq);
  */
 int pm_generic_thaw(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->thaw ? pm->thaw(dev) : 0;
+	return CALL_PM_OP(dev, thaw);
 }
 EXPORT_SYMBOL_GPL(pm_generic_thaw);
 
@@ -192,9 +169,7 @@ EXPORT_SYMBOL_GPL(pm_generic_thaw);
  */
 int pm_generic_resume_noirq(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->resume_noirq ? pm->resume_noirq(dev) : 0;
+	return CALL_PM_OP(dev, resume_noirq);
 }
 EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);
 
@@ -204,9 +179,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);
  */
 int pm_generic_resume_early(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->resume_early ? pm->resume_early(dev) : 0;
+	return CALL_PM_OP(dev, resume_early);
 }
 EXPORT_SYMBOL_GPL(pm_generic_resume_early);
 
@@ -216,9 +189,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume_early);
  */
 int pm_generic_resume(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->resume ? pm->resume(dev) : 0;
+	return CALL_PM_OP(dev, resume);
 }
 EXPORT_SYMBOL_GPL(pm_generic_resume);
 
@@ -228,9 +199,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume);
  */
 int pm_generic_restore_noirq(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->restore_noirq ? pm->restore_noirq(dev) : 0;
+	return CALL_PM_OP(dev, restore_noirq);
 }
 EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);
 
@@ -240,9 +209,7 @@ EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);
  */
 int pm_generic_restore_early(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->restore_early ? pm->restore_early(dev) : 0;
+	return CALL_PM_OP(dev, restore_early);
 }
 EXPORT_SYMBOL_GPL(pm_generic_restore_early);
 
@@ -252,9 +219,7 @@ EXPORT_SYMBOL_GPL(pm_generic_restore_early);
  */
 int pm_generic_restore(struct device *dev)
 {
-	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
-
-	return pm && pm->restore ? pm->restore(dev) : 0;
+	return CALL_PM_OP(dev, restore);
 }
 EXPORT_SYMBOL_GPL(pm_generic_restore);
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,13 @@`
`8`	`8`	`#include <linux/pm_runtime.h>`
`9`	`9`	`#include <linux/export.h>`
`10`	`10`
	`11`	`+#define CALL_PM_OP(dev, op) \`
	`12`	`+({ \`
	`13`	`+ struct device *_dev = (dev); \`
	`14`	`+ const struct dev_pm_ops *pm = _dev->driver ? _dev->driver->pm : NULL; \`
	`15`	`+ pm && pm->op ? pm->op(_dev) : 0; \`
	`16`	`+})`
	`17`	`+`
`11`	`18`	`#ifdef CONFIG_PM`
`12`	`19`	`/**`
`13`	`20`	`* pm_generic_runtime_suspend - Generic runtime suspend callback for subsystems.`
`@@ -19,12 +26,7 @@`
`19`	`26`	`*/`
`20`	`27`	`int pm_generic_runtime_suspend(struct device *dev)`
`21`	`28`	`{`
`22`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`23`		`- int ret;`
`24`		`-`
`25`		`- ret = pm && pm->runtime_suspend ? pm->runtime_suspend(dev) : 0;`
`26`		`-`
`27`		`- return ret;`
	`29`	`+ return CALL_PM_OP(dev, runtime_suspend);`
`28`	`30`	`}`
`29`	`31`	`EXPORT_SYMBOL_GPL(pm_generic_runtime_suspend);`
`30`	`32`
`@@ -38,12 +40,7 @@ EXPORT_SYMBOL_GPL(pm_generic_runtime_suspend);`
`38`	`40`	`*/`
`39`	`41`	`int pm_generic_runtime_resume(struct device *dev)`
`40`	`42`	`{`
`41`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`42`		`- int ret;`
`43`		`-`
`44`		`- ret = pm && pm->runtime_resume ? pm->runtime_resume(dev) : 0;`
`45`		`-`
`46`		`- return ret;`
	`43`	`+ return CALL_PM_OP(dev, runtime_resume);`
`47`	`44`	`}`
`48`	`45`	`EXPORT_SYMBOL_GPL(pm_generic_runtime_resume);`
`49`	`46`	`#endif /* CONFIG_PM */`
`@@ -72,9 +69,7 @@ int pm_generic_prepare(struct device *dev)`
`72`	`69`	`*/`
`73`	`70`	`int pm_generic_suspend_noirq(struct device *dev)`
`74`	`71`	`{`
`75`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`76`		`-`
`77`		`- return pm && pm->suspend_noirq ? pm->suspend_noirq(dev) : 0;`
	`72`	`+ return CALL_PM_OP(dev, suspend_noirq);`
`78`	`73`	`}`
`79`	`74`	`EXPORT_SYMBOL_GPL(pm_generic_suspend_noirq);`
`80`	`75`
`@@ -84,9 +79,7 @@ EXPORT_SYMBOL_GPL(pm_generic_suspend_noirq);`
`84`	`79`	`*/`
`85`	`80`	`int pm_generic_suspend_late(struct device *dev)`
`86`	`81`	`{`
`87`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`88`		`-`
`89`		`- return pm && pm->suspend_late ? pm->suspend_late(dev) : 0;`
	`82`	`+ return CALL_PM_OP(dev, suspend_late);`
`90`	`83`	`}`
`91`	`84`	`EXPORT_SYMBOL_GPL(pm_generic_suspend_late);`
`92`	`85`
`@@ -96,9 +89,7 @@ EXPORT_SYMBOL_GPL(pm_generic_suspend_late);`
`96`	`89`	`*/`
`97`	`90`	`int pm_generic_suspend(struct device *dev)`
`98`	`91`	`{`
`99`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`100`		`-`
`101`		`- return pm && pm->suspend ? pm->suspend(dev) : 0;`
	`92`	`+ return CALL_PM_OP(dev, suspend);`
`102`	`93`	`}`
`103`	`94`	`EXPORT_SYMBOL_GPL(pm_generic_suspend);`
`104`	`95`
`@@ -108,9 +99,7 @@ EXPORT_SYMBOL_GPL(pm_generic_suspend);`
`108`	`99`	`*/`
`109`	`100`	`int pm_generic_freeze_noirq(struct device *dev)`
`110`	`101`	`{`
`111`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`112`		`-`
`113`		`- return pm && pm->freeze_noirq ? pm->freeze_noirq(dev) : 0;`
	`102`	`+ return CALL_PM_OP(dev, freeze_noirq);`
`114`	`103`	`}`
`115`	`104`	`EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq);`
`116`	`105`
`@@ -120,9 +109,7 @@ EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq);`
`120`	`109`	`*/`
`121`	`110`	`int pm_generic_freeze(struct device *dev)`
`122`	`111`	`{`
`123`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`124`		`-`
`125`		`- return pm && pm->freeze ? pm->freeze(dev) : 0;`
	`112`	`+ return CALL_PM_OP(dev, freeze);`
`126`	`113`	`}`
`127`	`114`	`EXPORT_SYMBOL_GPL(pm_generic_freeze);`
`128`	`115`
`@@ -132,9 +119,7 @@ EXPORT_SYMBOL_GPL(pm_generic_freeze);`
`132`	`119`	`*/`
`133`	`120`	`int pm_generic_poweroff_noirq(struct device *dev)`
`134`	`121`	`{`
`135`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`136`		`-`
`137`		`- return pm && pm->poweroff_noirq ? pm->poweroff_noirq(dev) : 0;`
	`122`	`+ return CALL_PM_OP(dev, poweroff_noirq);`
`138`	`123`	`}`
`139`	`124`	`EXPORT_SYMBOL_GPL(pm_generic_poweroff_noirq);`
`140`	`125`
`@@ -144,9 +129,7 @@ EXPORT_SYMBOL_GPL(pm_generic_poweroff_noirq);`
`144`	`129`	`*/`
`145`	`130`	`int pm_generic_poweroff_late(struct device *dev)`
`146`	`131`	`{`
`147`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`148`		`-`
`149`		`- return pm && pm->poweroff_late ? pm->poweroff_late(dev) : 0;`
	`132`	`+ return CALL_PM_OP(dev, poweroff_late);`
`150`	`133`	`}`
`151`	`134`	`EXPORT_SYMBOL_GPL(pm_generic_poweroff_late);`
`152`	`135`
`@@ -156,9 +139,7 @@ EXPORT_SYMBOL_GPL(pm_generic_poweroff_late);`
`156`	`139`	`*/`
`157`	`140`	`int pm_generic_poweroff(struct device *dev)`
`158`	`141`	`{`
`159`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`160`		`-`
`161`		`- return pm && pm->poweroff ? pm->poweroff(dev) : 0;`
	`142`	`+ return CALL_PM_OP(dev, poweroff);`
`162`	`143`	`}`
`163`	`144`	`EXPORT_SYMBOL_GPL(pm_generic_poweroff);`
`164`	`145`
`@@ -168,9 +149,7 @@ EXPORT_SYMBOL_GPL(pm_generic_poweroff);`
`168`	`149`	`*/`
`169`	`150`	`int pm_generic_thaw_noirq(struct device *dev)`
`170`	`151`	`{`
`171`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`172`		`-`
`173`		`- return pm && pm->thaw_noirq ? pm->thaw_noirq(dev) : 0;`
	`152`	`+ return CALL_PM_OP(dev, thaw_noirq);`
`174`	`153`	`}`
`175`	`154`	`EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq);`
`176`	`155`
`@@ -180,9 +159,7 @@ EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq);`
`180`	`159`	`*/`
`181`	`160`	`int pm_generic_thaw(struct device *dev)`
`182`	`161`	`{`
`183`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`184`		`-`
`185`		`- return pm && pm->thaw ? pm->thaw(dev) : 0;`
	`162`	`+ return CALL_PM_OP(dev, thaw);`
`186`	`163`	`}`
`187`	`164`	`EXPORT_SYMBOL_GPL(pm_generic_thaw);`
`188`	`165`
`@@ -192,9 +169,7 @@ EXPORT_SYMBOL_GPL(pm_generic_thaw);`
`192`	`169`	`*/`
`193`	`170`	`int pm_generic_resume_noirq(struct device *dev)`
`194`	`171`	`{`
`195`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`196`		`-`
`197`		`- return pm && pm->resume_noirq ? pm->resume_noirq(dev) : 0;`
	`172`	`+ return CALL_PM_OP(dev, resume_noirq);`
`198`	`173`	`}`
`199`	`174`	`EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);`
`200`	`175`
`@@ -204,9 +179,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume_noirq);`
`204`	`179`	`*/`
`205`	`180`	`int pm_generic_resume_early(struct device *dev)`
`206`	`181`	`{`
`207`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`208`		`-`
`209`		`- return pm && pm->resume_early ? pm->resume_early(dev) : 0;`
	`182`	`+ return CALL_PM_OP(dev, resume_early);`
`210`	`183`	`}`
`211`	`184`	`EXPORT_SYMBOL_GPL(pm_generic_resume_early);`
`212`	`185`
`@@ -216,9 +189,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume_early);`
`216`	`189`	`*/`
`217`	`190`	`int pm_generic_resume(struct device *dev)`
`218`	`191`	`{`
`219`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`220`		`-`
`221`		`- return pm && pm->resume ? pm->resume(dev) : 0;`
	`192`	`+ return CALL_PM_OP(dev, resume);`
`222`	`193`	`}`
`223`	`194`	`EXPORT_SYMBOL_GPL(pm_generic_resume);`
`224`	`195`
`@@ -228,9 +199,7 @@ EXPORT_SYMBOL_GPL(pm_generic_resume);`
`228`	`199`	`*/`
`229`	`200`	`int pm_generic_restore_noirq(struct device *dev)`
`230`	`201`	`{`
`231`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`232`		`-`
`233`		`- return pm && pm->restore_noirq ? pm->restore_noirq(dev) : 0;`
	`202`	`+ return CALL_PM_OP(dev, restore_noirq);`
`234`	`203`	`}`
`235`	`204`	`EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);`
`236`	`205`
`@@ -240,9 +209,7 @@ EXPORT_SYMBOL_GPL(pm_generic_restore_noirq);`
`240`	`209`	`*/`
`241`	`210`	`int pm_generic_restore_early(struct device *dev)`
`242`	`211`	`{`
`243`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`244`		`-`
`245`		`- return pm && pm->restore_early ? pm->restore_early(dev) : 0;`
	`212`	`+ return CALL_PM_OP(dev, restore_early);`
`246`	`213`	`}`
`247`	`214`	`EXPORT_SYMBOL_GPL(pm_generic_restore_early);`
`248`	`215`
`@@ -252,9 +219,7 @@ EXPORT_SYMBOL_GPL(pm_generic_restore_early);`
`252`	`219`	`*/`
`253`	`220`	`int pm_generic_restore(struct device *dev)`
`254`	`221`	`{`
`255`		`- const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;`
`256`		`-`
`257`		`- return pm && pm->restore ? pm->restore(dev) : 0;`
	`222`	`+ return CALL_PM_OP(dev, restore);`
`258`	`223`	`}`
`259`	`224`	`EXPORT_SYMBOL_GPL(pm_generic_restore);`
`260`	`225`