* [PATCH 01/12] HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 02/12] HID: appletb-kbd: " Bastien Nocera
` (11 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-alps.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index ba00f6e6324b..21e55f3d0d1b 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -840,10 +840,8 @@ static struct hid_driver alps_driver = {
.raw_event = alps_raw_event,
.input_mapping = alps_input_mapping,
.input_configured = alps_input_configured,
-#ifdef CONFIG_PM
- .resume = alps_post_resume,
- .reset_resume = alps_post_reset,
-#endif
+ .resume = pm_ptr(alps_post_resume),
+ .reset_resume = pm_ptr(alps_post_reset),
};
module_hid_driver(alps_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 02/12] HID: appletb-kbd: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
2026-01-12 10:52 ` [PATCH 01/12] HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 03/12] HID: asus: " Bastien Nocera
` (10 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-appletb-kbd.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c
index b00687e67ce8..064e136610ec 100644
--- a/drivers/hid/hid-appletb-kbd.c
+++ b/drivers/hid/hid-appletb-kbd.c
@@ -501,10 +501,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
.remove = appletb_kbd_remove,
.event = appletb_kbd_hid_event,
.input_configured = appletb_kbd_input_configured,
-#ifdef CONFIG_PM
- .suspend = appletb_kbd_suspend,
- .reset_resume = appletb_kbd_reset_resume,
-#endif
+ .suspend = pm_ptr(appletb_kbd_suspend),
+ .reset_resume = pm_ptr(appletb_kbd_reset_resume),
.driver.dev_groups = appletb_kbd_groups,
};
module_hid_driver(appletb_kbd_hid_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 03/12] HID: asus: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
2026-01-12 10:52 ` [PATCH 01/12] HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM Bastien Nocera
2026-01-12 10:52 ` [PATCH 02/12] HID: appletb-kbd: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 04/12] HID: lenovo: " Bastien Nocera
` (9 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-asus.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index a444d41e53b6..1aaa40c2529a 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -1433,10 +1433,8 @@ static struct hid_driver asus_driver = {
.remove = asus_remove,
.input_mapping = asus_input_mapping,
.input_configured = asus_input_configured,
-#ifdef CONFIG_PM
- .reset_resume = asus_reset_resume,
- .resume = asus_resume,
-#endif
+ .reset_resume = pm_ptr(asus_reset_resume),
+ .resume = pm_ptr(asus_resume),
.event = asus_event,
.raw_event = asus_raw_event
};
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 04/12] HID: lenovo: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (2 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 03/12] HID: asus: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 05/12] HID: logitech-dj: " Bastien Nocera
` (8 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-lenovo.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c
index 9cc3e029e9f6..14652478d989 100644
--- a/drivers/hid/hid-lenovo.c
+++ b/drivers/hid/hid-lenovo.c
@@ -1570,9 +1570,7 @@ static struct hid_driver lenovo_driver = {
.raw_event = lenovo_raw_event,
.event = lenovo_event,
.report_fixup = lenovo_report_fixup,
-#ifdef CONFIG_PM
- .reset_resume = lenovo_reset_resume,
-#endif
+ .reset_resume = pm_ptr(lenovo_reset_resume),
};
module_hid_driver(lenovo_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 05/12] HID: logitech-dj: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (3 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 04/12] HID: lenovo: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 06/12] HID: nintendo: " Bastien Nocera
` (7 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-logitech-dj.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index cce54dd9884a..a3ed9624ca64 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -2044,9 +2044,7 @@ static struct hid_driver logi_djreceiver_driver = {
.probe = logi_dj_probe,
.remove = logi_dj_remove,
.raw_event = logi_dj_raw_event,
-#ifdef CONFIG_PM
- .reset_resume = logi_dj_reset_resume,
-#endif
+ .reset_resume = pm_ptr(logi_dj_reset_resume),
};
module_hid_driver(logi_djreceiver_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 06/12] HID: nintendo: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (4 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 05/12] HID: logitech-dj: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 07/12] HID: picolcd_core: " Bastien Nocera
` (6 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-nintendo.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index c2849a541f65..95b6df7b9b13 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -2826,11 +2826,8 @@ static struct hid_driver nintendo_hid_driver = {
.probe = nintendo_hid_probe,
.remove = nintendo_hid_remove,
.raw_event = nintendo_hid_event,
-
-#ifdef CONFIG_PM
- .resume = nintendo_hid_resume,
- .suspend = nintendo_hid_suspend,
-#endif
+ .resume = pm_ptr(nintendo_hid_resume),
+ .suspend = pm_ptr(nintendo_hid_suspend),
};
static int __init nintendo_init(void)
{
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 07/12] HID: picolcd_core: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (5 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 06/12] HID: nintendo: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 08/12] HID: hid-sensor-hub: " Bastien Nocera
` (5 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-picolcd_core.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c
index 297103be3381..e579b3080ce5 100644
--- a/drivers/hid/hid-picolcd_core.c
+++ b/drivers/hid/hid-picolcd_core.c
@@ -648,11 +648,9 @@ static struct hid_driver picolcd_driver = {
.probe = picolcd_probe,
.remove = picolcd_remove,
.raw_event = picolcd_raw_event,
-#ifdef CONFIG_PM
- .suspend = picolcd_suspend,
- .resume = picolcd_resume,
- .reset_resume = picolcd_reset_resume,
-#endif
+ .suspend = pm_ptr(picolcd_suspend),
+ .resume = pm_ptr(picolcd_resume),
+ .reset_resume = pm_ptr(picolcd_reset_resume),
};
module_hid_driver(picolcd_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 08/12] HID: hid-sensor-hub: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (6 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 07/12] HID: picolcd_core: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:52 ` [PATCH 09/12] HID: sony: " Bastien Nocera
` (4 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-sensor-hub.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 4c94c03cb573..7618dec9c31e 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -772,11 +772,9 @@ static struct hid_driver sensor_hub_driver = {
.remove = sensor_hub_remove,
.raw_event = sensor_hub_raw_event,
.report_fixup = sensor_hub_report_fixup,
-#ifdef CONFIG_PM
- .suspend = sensor_hub_suspend,
- .resume = sensor_hub_resume,
- .reset_resume = sensor_hub_reset_resume,
-#endif
+ .suspend = pm_ptr(sensor_hub_suspend),
+ .resume = pm_ptr(sensor_hub_resume),
+ .reset_resume = pm_ptr(sensor_hub_reset_resume),
};
module_hid_driver(sensor_hub_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 09/12] HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (7 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 08/12] HID: hid-sensor-hub: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 17:31 ` kernel test robot
2026-01-12 10:52 ` [PATCH 10/12] HID: uclogic: " Bastien Nocera
` (3 subsequent siblings)
12 siblings, 1 reply; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-sony.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index b966e4044238..d94ece0448e9 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2284,12 +2284,9 @@ static struct hid_driver sony_driver = {
.remove = sony_remove,
.report_fixup = sony_report_fixup,
.raw_event = sony_raw_event,
-
-#ifdef CONFIG_PM
- .suspend = sony_suspend,
- .resume = sony_resume,
- .reset_resume = sony_resume,
-#endif
+ .suspend = pm_ptr(sony_suspend),
+ .resume = pm_ptr(sony_resume),
+ .reset_resume = pm_ptr(sony_resume),
};
static int __init sony_init(void)
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 09/12] HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 ` [PATCH 09/12] HID: sony: " Bastien Nocera
@ 2026-01-12 17:31 ` kernel test robot
0 siblings, 0 replies; 18+ messages in thread
From: kernel test robot @ 2026-01-12 17:31 UTC (permalink / raw)
To: Bastien Nocera, linux-input
Cc: oe-kbuild-all, linux-kernel, Jiri Kosina, Benjamin Tissoires,
Bastien Nocera
Hi Bastien,
kernel test robot noticed the following build errors:
[auto build test ERROR on hid/for-next]
[also build test ERROR on linus/master v6.19-rc5 next-20260109]
[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/Bastien-Nocera/HID-hid-alps-Use-pm_ptr-instead-of-ifdef-CONFIG_PM/20260112-190559
base: https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-next
patch link: https://lore.kernel.org/r/20260112105500.3664834-10-hadess%40hadess.net
patch subject: [PATCH 09/12] HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM
config: parisc-defconfig (https://download.01.org/0day-ci/archive/20260113/202601130046.THZRFNIA-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 15.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260113/202601130046.THZRFNIA-lkp@intel.com/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 <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601130046.THZRFNIA-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from include/linux/kernel.h:36,
from include/linux/random.h:7,
from include/linux/nodemask.h:94,
from include/linux/numa.h:6,
from include/linux/cpumask.h:15,
from include/linux/smp.h:13,
from include/linux/lockdep.h:14,
from include/linux/spinlock.h:63,
from include/linux/sched.h:37,
from include/linux/ratelimit.h:6,
from include/linux/dev_printk.h:16,
from include/linux/device.h:15,
from drivers/hid/hid-sony.c:31:
>> drivers/hid/hid-sony.c:2402:36: error: 'sony_suspend' undeclared here (not in a function)
2402 | .suspend = pm_ptr(sony_suspend),
| ^~~~~~~~~~~~
include/linux/util_macros.h:136:44: note: in definition of macro 'PTR_IF'
136 | #define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL)
| ^~~
drivers/hid/hid-sony.c:2402:29: note: in expansion of macro 'pm_ptr'
2402 | .suspend = pm_ptr(sony_suspend),
| ^~~~~~
>> drivers/hid/hid-sony.c:2403:36: error: 'sony_resume' undeclared here (not in a function); did you mean 'sony_remove'?
2403 | .resume = pm_ptr(sony_resume),
| ^~~~~~~~~~~
include/linux/util_macros.h:136:44: note: in definition of macro 'PTR_IF'
136 | #define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL)
| ^~~
drivers/hid/hid-sony.c:2403:29: note: in expansion of macro 'pm_ptr'
2403 | .resume = pm_ptr(sony_resume),
| ^~~~~~
vim +/sony_suspend +2402 drivers/hid/hid-sony.c
2392
2393 static struct hid_driver sony_driver = {
2394 .name = "sony",
2395 .id_table = sony_devices,
2396 .input_mapping = sony_mapping,
2397 .input_configured = sony_input_configured,
2398 .probe = sony_probe,
2399 .remove = sony_remove,
2400 .report_fixup = sony_report_fixup,
2401 .raw_event = sony_raw_event,
> 2402 .suspend = pm_ptr(sony_suspend),
> 2403 .resume = pm_ptr(sony_resume),
2404 .reset_resume = pm_ptr(sony_resume),
2405 };
2406
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 10/12] HID: uclogic: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (8 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 09/12] HID: sony: " Bastien Nocera
@ 2026-01-12 10:52 ` Bastien Nocera
2026-01-12 10:53 ` [PATCH 11/12] HID: wacom: " Bastien Nocera
` (2 subsequent siblings)
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:52 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/hid-uclogic-core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index 34fb03ae8ee2..a73a07b0b238 100644
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -617,10 +617,8 @@ static struct hid_driver uclogic_driver = {
.raw_event = uclogic_raw_event,
.input_mapping = uclogic_input_mapping,
.input_configured = uclogic_input_configured,
-#ifdef CONFIG_PM
- .resume = uclogic_resume,
- .reset_resume = uclogic_resume,
-#endif
+ .resume = pm_ptr(uclogic_resume),
+ .reset_resume = pm_ptr(uclogic_resume),
};
module_hid_driver(uclogic_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 11/12] HID: wacom: Use pm_ptr instead of #ifdef CONFIG_PM
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (9 preceding siblings ...)
2026-01-12 10:52 ` [PATCH 10/12] HID: uclogic: " Bastien Nocera
@ 2026-01-12 10:53 ` Bastien Nocera
2026-01-12 10:53 ` [PATCH 12/12] HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP Bastien Nocera
2026-01-12 16:41 ` [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Jiri Kosina
12 siblings, 0 replies; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:53 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/wacom_sys.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 9a57504e51a1..fbb07c71f0ba 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2949,10 +2949,8 @@ static struct hid_driver wacom_driver = {
.probe = wacom_probe,
.remove = wacom_remove,
.report = wacom_wac_report,
-#ifdef CONFIG_PM
- .resume = wacom_resume,
- .reset_resume = wacom_reset_resume,
-#endif
+ .resume = pm_ptr(wacom_resume),
+ .reset_resume = pm_ptr(wacom_reset_resume),
.raw_event = wacom_raw_event,
};
module_hid_driver(wacom_driver);
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 12/12] HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (10 preceding siblings ...)
2026-01-12 10:53 ` [PATCH 11/12] HID: wacom: " Bastien Nocera
@ 2026-01-12 10:53 ` Bastien Nocera
2026-01-12 17:00 ` kernel test robot
2026-01-12 16:41 ` [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Jiri Kosina
12 siblings, 1 reply; 18+ messages in thread
From: Bastien Nocera @ 2026-01-12 10:53 UTC (permalink / raw)
To: linux-input; +Cc: linux-kernel, Jiri Kosina, Benjamin Tissoires, Bastien Nocera
This increases build coverage and allows to drop an #ifdef.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
drivers/hid/surface-hid/surface_hid.c | 2 +-
drivers/hid/surface-hid/surface_hid_core.c | 5 -----
drivers/hid/surface-hid/surface_kbd.c | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c
index eae47e0d95ed..21904612b5ad 100644
--- a/drivers/hid/surface-hid/surface_hid.c
+++ b/drivers/hid/surface-hid/surface_hid.c
@@ -241,7 +241,7 @@ static struct ssam_device_driver surface_hid_driver = {
.match_table = surface_hid_match,
.driver = {
.name = "surface_hid",
- .pm = &surface_hid_pm_ops,
+ .pm = pm_ptr_sleep(&surface_hid_pm_ops),
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
},
};
diff --git a/drivers/hid/surface-hid/surface_hid_core.c b/drivers/hid/surface-hid/surface_hid_core.c
index 6690c24f28f0..33fe15fbcf6c 100644
--- a/drivers/hid/surface-hid/surface_hid_core.c
+++ b/drivers/hid/surface-hid/surface_hid_core.c
@@ -281,11 +281,6 @@ const struct dev_pm_ops surface_hid_pm_ops = {
};
EXPORT_SYMBOL_GPL(surface_hid_pm_ops);
-#else /* CONFIG_PM_SLEEP */
-
-const struct dev_pm_ops surface_hid_pm_ops = { };
-EXPORT_SYMBOL_GPL(surface_hid_pm_ops);
-
#endif /* CONFIG_PM_SLEEP */
MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c
index 0be01b5e7425..6ab6870f10e8 100644
--- a/drivers/hid/surface-hid/surface_kbd.c
+++ b/drivers/hid/surface-hid/surface_kbd.c
@@ -288,7 +288,7 @@ static struct platform_driver surface_kbd_driver = {
.driver = {
.name = "surface_keyboard",
.acpi_match_table = surface_kbd_match,
- .pm = &surface_hid_pm_ops,
+ .pm = pm_ptr_sleep(&surface_hid_pm_ops),
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
},
};
--
2.52.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 12/12] HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP
2026-01-12 10:53 ` [PATCH 12/12] HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP Bastien Nocera
@ 2026-01-12 17:00 ` kernel test robot
0 siblings, 0 replies; 18+ messages in thread
From: kernel test robot @ 2026-01-12 17:00 UTC (permalink / raw)
To: Bastien Nocera, linux-input
Cc: llvm, oe-kbuild-all, linux-kernel, Jiri Kosina,
Benjamin Tissoires, Bastien Nocera
Hi Bastien,
kernel test robot noticed the following build errors:
[auto build test ERROR on hid/for-next]
[also build test ERROR on linus/master v6.19-rc5 next-20260109]
[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/Bastien-Nocera/HID-hid-alps-Use-pm_ptr-instead-of-ifdef-CONFIG_PM/20260112-190559
base: https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-next
patch link: https://lore.kernel.org/r/20260112105500.3664834-13-hadess%40hadess.net
patch subject: [PATCH 12/12] HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP
config: x86_64-buildonly-randconfig-006-20260112 (https://download.01.org/0day-ci/archive/20260113/202601130046.aUeJ5BLs-lkp@intel.com/config)
compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260113/202601130046.aUeJ5BLs-lkp@intel.com/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 <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601130046.aUeJ5BLs-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/hid/surface-hid/surface_kbd.c:291:9: error: call to undeclared function 'pm_ptr_sleep'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
291 | .pm = pm_ptr_sleep(&surface_hid_pm_ops),
| ^
>> drivers/hid/surface-hid/surface_kbd.c:291:9: error: incompatible integer to pointer conversion initializing 'const struct dev_pm_ops *' with an expression of type 'int' [-Wint-conversion]
291 | .pm = pm_ptr_sleep(&surface_hid_pm_ops),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/hid/surface-hid/surface_kbd.c:291:9: error: initializer element is not a compile-time constant
291 | .pm = pm_ptr_sleep(&surface_hid_pm_ops),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.
vim +/pm_ptr_sleep +291 drivers/hid/surface-hid/surface_kbd.c
284
285 static struct platform_driver surface_kbd_driver = {
286 .probe = surface_kbd_probe,
287 .remove = surface_kbd_remove,
288 .driver = {
289 .name = "surface_keyboard",
290 .acpi_match_table = surface_kbd_match,
> 291 .pm = pm_ptr_sleep(&surface_hid_pm_ops),
292 .probe_type = PROBE_PREFER_ASYNCHRONOUS,
293 },
294 };
295 module_platform_driver(surface_kbd_driver);
296
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM*
2026-01-12 10:52 [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Bastien Nocera
` (11 preceding siblings ...)
2026-01-12 10:53 ` [PATCH 12/12] HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP Bastien Nocera
@ 2026-01-12 16:41 ` Jiri Kosina
2026-01-12 17:00 ` Benjamin Tissoires
12 siblings, 1 reply; 18+ messages in thread
From: Jiri Kosina @ 2026-01-12 16:41 UTC (permalink / raw)
To: Bastien Nocera; +Cc: linux-input, linux-kernel, Benjamin Tissoires
On Mon, 12 Jan 2026, Bastien Nocera wrote:
> All those changes should be safe, as similar ones were done in other
> subsystems, but I'm uncertain about the surface changes.
>
> Bastien Nocera (12):
> HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: appletb-kbd: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: asus: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: lenovo: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: logitech-dj: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: nintendo: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: picolcd_core: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: hid-sensor-hub: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: uclogic: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: wacom: Use pm_ptr instead of #ifdef CONFIG_PM
> HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP
>
> drivers/hid/hid-alps.c | 6 ++----
> drivers/hid/hid-appletb-kbd.c | 6 ++----
> drivers/hid/hid-asus.c | 6 ++----
> drivers/hid/hid-lenovo.c | 4 +---
> drivers/hid/hid-logitech-dj.c | 4 +---
> drivers/hid/hid-nintendo.c | 7 ++-----
> drivers/hid/hid-picolcd_core.c | 8 +++-----
> drivers/hid/hid-sensor-hub.c | 8 +++-----
> drivers/hid/hid-sony.c | 9 +++------
> drivers/hid/hid-uclogic-core.c | 6 ++----
> drivers/hid/surface-hid/surface_hid.c | 2 +-
> drivers/hid/surface-hid/surface_hid_core.c | 5 -----
> drivers/hid/surface-hid/surface_kbd.c | 2 +-
> drivers/hid/wacom_sys.c | 6 ++----
> 14 files changed, 25 insertions(+), 54 deletions(-)
Thanks Bastien, this is now in hid.git#for-6.20/pm_ptr.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM*
2026-01-12 16:41 ` [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM* Jiri Kosina
@ 2026-01-12 17:00 ` Benjamin Tissoires
2026-01-12 17:03 ` Jiri Kosina
0 siblings, 1 reply; 18+ messages in thread
From: Benjamin Tissoires @ 2026-01-12 17:00 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Bastien Nocera, linux-input, linux-kernel, Benjamin Tissoires
On Jan 12 2026, Jiri Kosina wrote:
> On Mon, 12 Jan 2026, Bastien Nocera wrote:
>
> > All those changes should be safe, as similar ones were done in other
> > subsystems, but I'm uncertain about the surface changes.
> >
> > Bastien Nocera (12):
> > HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: appletb-kbd: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: asus: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: lenovo: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: logitech-dj: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: nintendo: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: picolcd_core: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: hid-sensor-hub: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: uclogic: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: wacom: Use pm_ptr instead of #ifdef CONFIG_PM
> > HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP
> >
> > drivers/hid/hid-alps.c | 6 ++----
> > drivers/hid/hid-appletb-kbd.c | 6 ++----
> > drivers/hid/hid-asus.c | 6 ++----
> > drivers/hid/hid-lenovo.c | 4 +---
> > drivers/hid/hid-logitech-dj.c | 4 +---
> > drivers/hid/hid-nintendo.c | 7 ++-----
> > drivers/hid/hid-picolcd_core.c | 8 +++-----
> > drivers/hid/hid-sensor-hub.c | 8 +++-----
> > drivers/hid/hid-sony.c | 9 +++------
> > drivers/hid/hid-uclogic-core.c | 6 ++----
> > drivers/hid/surface-hid/surface_hid.c | 2 +-
> > drivers/hid/surface-hid/surface_hid_core.c | 5 -----
> > drivers/hid/surface-hid/surface_kbd.c | 2 +-
> > drivers/hid/wacom_sys.c | 6 ++----
> > 14 files changed, 25 insertions(+), 54 deletions(-)
>
> Thanks Bastien, this is now in hid.git#for-6.20/pm_ptr.
>
There is something wrong with the series:
https://gitlab.freedesktop.org/bentiss/hid/-/jobs/90949365
```
In file included from ./include/linux/kernel.h:36,
from ./include/linux/random.h:7,
from ./include/linux/nodemask.h:94,
from ./include/linux/numa.h:6,
from ./include/linux/cpumask.h:15,
from ./arch/x86/include/asm/cpumask.h:7,
from ./arch/x86/include/asm/msr.h:11,
from ./arch/x86/include/asm/tsc.h:11,
from ./arch/x86/include/asm/timex.h:6,
from ./include/linux/timex.h:67,
from ./include/linux/time32.h:13,
from ./include/linux/time.h:60,
from ./include/linux/stat.h:19,
from ./include/linux/module.h:13,
from drivers/hid/hid-lenovo.c:27:
drivers/hid/hid-lenovo.c:1573:32: error: 'lenovo_reset_resume' undeclared here (not in a function); did you mean 'hidinput_reset_resume'?
1573 | .reset_resume = pm_ptr(lenovo_reset_resume),
| ^~~~~~~~~~~~~~~~~~~
./include/linux/util_macros.h:136:44: note: in definition of macro 'PTR_IF'
136 | #define PTR_IF(cond, ptr) ((cond) ? (ptr) : NULL)
| ^~~
drivers/hid/hid-lenovo.c:1573:25: note: in expansion of macro 'pm_ptr'
1573 | .reset_resume = pm_ptr(lenovo_reset_resume),
| ^~~~~~
make[4]: *** [scripts/Makefile.build:287: drivers/hid/hid-lenovo.o] Error 1
```
Bastien, are you sure that's the only change required?
Cheers,
Benjamin
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 00/12] HID: Use pm_*ptr instead of #ifdef CONFIG_PM*
2026-01-12 17:00 ` Benjamin Tissoires
@ 2026-01-12 17:03 ` Jiri Kosina
0 siblings, 0 replies; 18+ messages in thread
From: Jiri Kosina @ 2026-01-12 17:03 UTC (permalink / raw)
To: Benjamin Tissoires
Cc: Bastien Nocera, linux-input, linux-kernel, Benjamin Tissoires
On Mon, 12 Jan 2026, Benjamin Tissoires wrote:
> > > All those changes should be safe, as similar ones were done in other
> > > subsystems, but I'm uncertain about the surface changes.
> > >
> > > Bastien Nocera (12):
> > > HID: hid-alps: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: appletb-kbd: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: asus: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: lenovo: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: logitech-dj: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: nintendo: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: picolcd_core: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: hid-sensor-hub: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: uclogic: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: wacom: Use pm_ptr instead of #ifdef CONFIG_PM
> > > HID: surface: Use pm_ptr_sleep instead of #ifdef CONFIG_PM_SLEEP
> > >
> > > drivers/hid/hid-alps.c | 6 ++----
> > > drivers/hid/hid-appletb-kbd.c | 6 ++----
> > > drivers/hid/hid-asus.c | 6 ++----
> > > drivers/hid/hid-lenovo.c | 4 +---
> > > drivers/hid/hid-logitech-dj.c | 4 +---
> > > drivers/hid/hid-nintendo.c | 7 ++-----
> > > drivers/hid/hid-picolcd_core.c | 8 +++-----
> > > drivers/hid/hid-sensor-hub.c | 8 +++-----
> > > drivers/hid/hid-sony.c | 9 +++------
> > > drivers/hid/hid-uclogic-core.c | 6 ++----
> > > drivers/hid/surface-hid/surface_hid.c | 2 +-
> > > drivers/hid/surface-hid/surface_hid_core.c | 5 -----
> > > drivers/hid/surface-hid/surface_kbd.c | 2 +-
> > > drivers/hid/wacom_sys.c | 6 ++----
> > > 14 files changed, 25 insertions(+), 54 deletions(-)
> >
> > Thanks Bastien, this is now in hid.git#for-6.20/pm_ptr.
> >
>
> There is something wrong with the series:
> https://gitlab.freedesktop.org/bentiss/hid/-/jobs/90949365
Yeah, and 0day bot found another issue. Dropping for now, this needs more
polishing apparently :)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 18+ messages in thread