input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Subsystems (3)
PATCH 1/1 input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Convert deprecated SIMPLE_DEV_PM_OPS
to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr().
This lets us drop the __maybe_unused annotations
from the resume callbacks and reduces kernel size
when CONFIG_PM or CONFIG_PM_SLEEP is disabled.
--- drivers/input/misc/88pm80x_onkey.c | 4 ++-- drivers/input/misc/nxp-bbnsm-pwrkey.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/input/misc/88pm80x_onkey.c +2 -2
@@ -47,7 +47,7 @@ static irqreturn_t pm80x_onkey_handler(int irq, void *data)return IRQ_HANDLED ; } -static SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, pm80x_dev_resume);static int pm80x_onkey_probe (struct platform_device *pdev)
@@ -138,7 +138,7 @@ static void pm80x_onkey_remove(struct platform_device *pdev)static struct platform_driver pm80x_onkey_driver = { .driver = { .name ="88pm80x-onkey" , - .pm = &pm80x_onkey_pm_ops, + .pm =pm_sleep_ptr (&pm80x_onkey_pm_ops), }, .probe = pm80x_onkey_probe, .remove = pm80x_onkey_remove,
drivers/input/misc/nxp-bbnsm-pwrkey.c +4 -4
@@ -193,7 +193,7 @@ static void bbnsm_pwrkey_remove(struct platform_device *pdev)device_init_wakeup (&pdev->dev, false); } -static int __maybe_unused bbnsm_pwrkey_suspend (struct device *dev) +static int bbnsm_pwrkey_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct bbnsm_pwrkey *bbnsm =platform_get_drvdata (pdev);
@@ -203,7 +203,7 @@ static int __maybe_unused bbnsm_pwrkey_suspend(struct device *dev)return 0 ; } -static int __maybe_unused bbnsm_pwrkey_resume (struct device *dev) +static int bbnsm_pwrkey_resume (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct bbnsm_pwrkey *bbnsm =platform_get_drvdata (pdev);
@@ -213,7 +213,7 @@ static int __maybe_unused bbnsm_pwrkey_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend, bbnsm_pwrkey_resume);static const struct of_device_id bbnsm_pwrkey_ids[] = {
@@ -225,7 +225,7 @@ MODULE_DEVICE_TABLE(of, bbnsm_pwrkey_ids);static struct platform_driver bbnsm_pwrkey_driver = { .driver = { .name ="bbnsm_pwrkey" , - .pm = &bbnsm_pwrkey_pm_ops, + .pm =pm_sleep_ptr (&bbnsm_pwrkey_pm_ops), .of_match_table = bbnsm_pwrkey_ids, }, .probe = bbnsm_pwrkey_probe,
Signature · 1 line
2.53.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] The patch breaks the build when `CONFIG_PM` is disabled because `pm80x_dev_suspend` and…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The patch breaks the build when CONFIG_PM is disabled because pm80x_dev_suspend and pm80x_dev_resume become undeclared identifiers. --
--- Patch [1]: [PATCH] input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS() --- commit 831b6a38a335cea06b4312be1068bf63ef9bd3c9
Author: Triet Hoang <[email protected]>
input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Convert deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This drops the __maybe_unused annotations from the resume callbacks and reduces kernel size when PM is disabled.
Quoted 4 lines
drivers/input/misc/88pm80x_onkey.c +0
-0
[ ... ]
drivers/input/misc/88pm80x_onkey.c static irqreturn_t pm80x_onkey_handler(int irq, void *data) · line 51
Quoted 7 lines
drivers/input/misc/88pm80x_onkey.c +1
-1@@ -47,7 +47,7 @@ static irqreturn_t pm80x_onkey_handler(int irq, void *data)return IRQ_HANDLED ; } -static SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, pm80x_dev_resume);
[Severity: Low]
Does this break the build when CONFIG_PM is disabled?
Unlike SIMPLE_DEV_PM_OPS, DEFINE_SIMPLE_DEV_PM_OPS uses pm_sleep_ptr() which evaluates the C ternary operator with IS_ENABLED(). This means the compiler still parses the arguments and requires them to be declared, even if they are ultimately discarded.
Looking at include/linux/mfd/88pm80x.h, pm80x_dev_suspend and pm80x_dev_resume are wrapped in #ifdef CONFIG_PM without providing empty fallback stubs:
#ifdef CONFIG_PM
static inline int pm80x_dev_suspend(struct device *dev) {
...
Will this result in undeclared identifier compilation errors when building with CONFIG_PM=n?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
PATCH v2 1/1 input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Convert deprecated SIMPLE_DEV_PM_OPS
to DEFINE_SIMPLE_DEV_PM_OPS and pm_ptr/pm_sleep_ptr().
This lets us drop the __maybe_unused annotations
from the resume callbacks and reduces kernel size
when CONFIG_PM or CONFIG_PM_SLEEP is disabled.
---
Changes in v2:
- Use pm_ptr() for pm80x_onkey_pm_ops
- Remove #ifdef CONFIG_PM
---
drivers/input/misc/88pm80x_onkey.c | 4 ++-- drivers/input/misc/nxp-bbnsm-pwrkey.c | 8 ++++---- include/linux/mfd/88pm80x.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/input/misc/88pm80x_onkey.c +2 -2
@@ -47,7 +47,7 @@ static irqreturn_t pm80x_onkey_handler(int irq, void *data)return IRQ_HANDLED ; } -static SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend, pm80x_dev_resume);static int pm80x_onkey_probe (struct platform_device *pdev)
@@ -138,7 +138,7 @@ static void pm80x_onkey_remove(struct platform_device *pdev)static struct platform_driver pm80x_onkey_driver = { .driver = { .name ="88pm80x-onkey" , - .pm = &pm80x_onkey_pm_ops, + .pm =pm_ptr (&pm80x_onkey_pm_ops), }, .probe = pm80x_onkey_probe, .remove = pm80x_onkey_remove,
drivers/input/misc/nxp-bbnsm-pwrkey.c +4 -4
@@ -193,7 +193,7 @@ static void bbnsm_pwrkey_remove(struct platform_device *pdev)device_init_wakeup (&pdev->dev, false); } -static int __maybe_unused bbnsm_pwrkey_suspend (struct device *dev) +static int bbnsm_pwrkey_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct bbnsm_pwrkey *bbnsm =platform_get_drvdata (pdev);
@@ -203,7 +203,7 @@ static int __maybe_unused bbnsm_pwrkey_suspend(struct device *dev)return 0 ; } -static int __maybe_unused bbnsm_pwrkey_resume (struct device *dev) +static int bbnsm_pwrkey_resume (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct bbnsm_pwrkey *bbnsm =platform_get_drvdata (pdev);
@@ -213,7 +213,7 @@ static int __maybe_unused bbnsm_pwrkey_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend, bbnsm_pwrkey_resume);static const struct of_device_id bbnsm_pwrkey_ids[] = {
@@ -225,7 +225,7 @@ MODULE_DEVICE_TABLE(of, bbnsm_pwrkey_ids);static struct platform_driver bbnsm_pwrkey_driver = { .driver = { .name ="bbnsm_pwrkey" , - .pm = &bbnsm_pwrkey_pm_ops, + .pm =pm_sleep_ptr (&bbnsm_pwrkey_pm_ops), .of_match_table = bbnsm_pwrkey_ids, }, .probe = bbnsm_pwrkey_probe,
include/linux/mfd/88pm80x.h +0 -2
@@ -339,7 +339,6 @@ static inline void pm80x_free_irq(struct pm80x_chip *pm80x, int irq, void *data)free_irq (regmap_irq_get_virq (pm80x->irq_data, irq), data); } -#ifdef CONFIG_PM static inline int pm80x_dev_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);
@@ -363,7 +362,6 @@ static inline int pm80x_dev_resume(struct device *dev)return 0 ; } -#endif extern int pm80x_init (struct i2c_client *client);extern int pm80x_deinit (void );
Signature · 1 line
2.53.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] Out-of-bounds memory access in pm80x_dev_suspend and pm80x_dev_resume due to using a virtual IRQ number as a bit index. --
--- Patch [1]: [PATCH v2] input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS() --- commit 34551f878a1e83fc07284971e8c372f8a5be3f46
Author: Triet Hoang <[email protected]>
input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
This commit converts the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and uses pm_ptr/pm_sleep_ptr(). This allows dropping the __maybe_unused annotations from the resume callbacks and reduces kernel size when PM options are disabled.
[ ... ]
include/linux/mfd/88pm80x.h static inline void pm80x_free_irq(struct pm80x_chip *pm80x, int irq, void *data) · line 344
Quoted 12 lines
include/linux/mfd/88pm80x.h +0
-1@@ -339,7 +339,6 @@ static inline void pm80x_free_irq(struct pm80x_chip *pm80x, int irq, void *data)free_irq (regmap_irq_get_virq (pm80x->irq_data, irq), data); } -#ifdef CONFIG_PM static inline int pm80x_dev_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);
[Severity: High]
This is a pre-existing issue, but does using the virtual IRQ as a bit index here lead to out-of-bounds memory accesses?
Looking at the body of pm80x_dev_suspend():
int irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(dev))
set_bit(irq, &chip->wu_flag);Since platform_get_irq() returns a virtual IRQ number dynamically assigned by the kernel, can this value exceed the capacity of the unsigned long wu_flag?
Also, if platform_get_irq() returns a negative error code such as -ENXIO, would passing it as an unsigned bit index to set_bit() cause a massive out-of-bounds memory write and corrupt memory?
The same pattern exists in pm80x_dev_resume() with clear_bit().
Quoted 5 lines
include/linux/mfd/88pm80x.h +0
-1@@ -363,7 +362,6 @@ static inline int pm80x_dev_resume(struct device *dev)return 0 ; } -#endif
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Triet,
kernel test robot noticed the following build errors:
[auto build test ERROR on dtor-input/next]
[also build test ERROR on dtor-input/for-linus hid/for-next linus/master v7.2 next-20260821] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Triet-Hoang/input-misc-Convert-to-DEFINE_SIMPLE_DEV_PM_OPS/20260821-094215 base: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next patch link: https://lore.kernel.org/r/20260821024215.55188-1-triet.hoang.dev%40gmail.com patch subject: [PATCH] input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS() config: parisc-allmodconfig (https://download.01.org/0day-ci/archive/20260823/[email protected]/config) compiler: hppa-linux-gcc (GCC) 16.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260823/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from include/linux/kernel.h:35,
from drivers/input/misc/88pm80x_onkey.c:10:
>> drivers/input/misc/88pm80x_onkey.c:50:53: error: 'pm80x_dev_suspend' undeclared here (not in a function)
50 | static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
| ^~~~~~~~~~~~~~~~~
include/linux/util_macros.h:136:44: note: in definition of macro 'PTR_IF'
136 | #define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL)
| ^~~
include/linux/pm.h:315:20: note: in expansion of macro 'pm_sleep_ptr'
315 | .suspend = pm_sleep_ptr(suspend_fn), \
| ^~~~~~~~~~~~
include/linux/pm.h:375:9: note: in expansion of macro 'SYSTEM_SLEEP_PM_OPS'
375 | SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
| ^~~~~~~~~~~~~~~~~~~
include/linux/pm.h:417:9: note: in expansion of macro '_DEFINE_DEV_PM_OPS'
417 | _DEFINE_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL)
| ^~~~~~~~~~~~~~~~~~
drivers/input/misc/88pm80x_onkey.c:50:8: note: in expansion of macro 'DEFINE_SIMPLE_DEV_PM_OPS'
50 | static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/input/misc/88pm80x_onkey.c:51:26: error: 'pm80x_dev_resume' undeclared here (not in a function)
51 | pm80x_dev_resume);
| ^~~~~~~~~~~~~~~~
include/linux/util_macros.h:136:44: note: in definition of macro 'PTR_IF'
136 | #define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL)
| ^~~
include/linux/pm.h:316:19: note: in expansion of macro 'pm_sleep_ptr'
316 | .resume = pm_sleep_ptr(resume_fn), \
| ^~~~~~~~~~~~
include/linux/pm.h:375:9: note: in expansion of macro 'SYSTEM_SLEEP_PM_OPS'
375 | SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
| ^~~~~~~~~~~~~~~~~~~
include/linux/pm.h:417:9: note: in expansion of macro '_DEFINE_DEV_PM_OPS'
417 | _DEFINE_DEV_PM_OPS(name, suspend_fn, resume_fn, NULL, NULL, NULL)
| ^~~~~~~~~~~~~~~~~~
drivers/input/misc/88pm80x_onkey.c:50:8: note: in expansion of macro 'DEFINE_SIMPLE_DEV_PM_OPS'
50 | static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
| ^~~~~~~~~~~~~~~~~~~~~~~~vim +/pm80x_dev_suspend +50 drivers/input/misc/88pm80x_onkey.c
49
> 50 static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
> 51 pm80x_dev_resume);
52 --
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Triet,
kernel test robot noticed the following build errors:
[auto build test ERROR on dtor-input/next]
[also build test ERROR on dtor-input/for-linus hid/for-next linus/master v7.2 next-20260821] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Triet-Hoang/input-misc-Convert-to-DEFINE_SIMPLE_DEV_PM_OPS/20260821-094215 base: https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next patch link: https://lore.kernel.org/r/20260821024215.55188-1-triet.hoang.dev%40gmail.com patch subject: [PATCH] input: misc: Convert to DEFINE_SIMPLE_DEV_PM_OPS() config: i386-randconfig-013-20260823 (https://download.01.org/0day-ci/archive/20260823/[email protected]/config) compiler: clang version 22.1.3 (https://github.com/llvm/llvm-project e9846648fd6183ee6d8cbdb4502213fcf902a211) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260823/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> drivers/input/misc/88pm80x_onkey.c:50:53: error: use of undeclared identifier 'pm80x_dev_suspend'
50 | static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
| ^~~~~~~~~~~~~~~~~
>> drivers/input/misc/88pm80x_onkey.c:51:5: error: use of undeclared identifier 'pm80x_dev_resume'
51 | pm80x_dev_resume);
| ^~~~~~~~~~~~~~~~
>> drivers/input/misc/88pm80x_onkey.c:50:53: error: use of undeclared identifier 'pm80x_dev_suspend'
50 | static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
| ^~~~~~~~~~~~~~~~~
>> drivers/input/misc/88pm80x_onkey.c:51:5: error: use of undeclared identifier 'pm80x_dev_resume'
51 | pm80x_dev_resume);
| ^~~~~~~~~~~~~~~~
>> drivers/input/misc/88pm80x_onkey.c:50:53: error: use of undeclared identifier 'pm80x_dev_suspend'
50 | static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
| ^~~~~~~~~~~~~~~~~
>> drivers/input/misc/88pm80x_onkey.c:51:5: error: use of undeclared identifier 'pm80x_dev_resume'
51 | pm80x_dev_resume);
| ^~~~~~~~~~~~~~~~6 errors generated.
vim +/pm80x_dev_suspend +50 drivers/input/misc/88pm80x_onkey.c
49
> 50 static DEFINE_SIMPLE_DEV_PM_OPS(pm80x_onkey_pm_ops, pm80x_dev_suspend,
> 51 pm80x_dev_resume);
52 --
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki