From: Thomas Weißschuh Date: Thu, 12 Oct 2023 10:23:38 +0000 (+0200) Subject: HID: core: remove #ifdef CONFIG_PM from hid_driver X-Git-Tag: v6.7-rc1~104^2~7^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df8b030d82dd1224881acb4e778fa06c4824f72b;p=thirdparty%2Flinux.git HID: core: remove #ifdef CONFIG_PM from hid_driver Allow HID drivers to pass ->suspend, ->resume and ->reset_resume via pm_ptr(). Through the usage of pm_ptr() the CONFIG_PM-dependent code will always be compiled, protecting against bitrot. The linker will then garbage-collect the unused function avoiding any overhead. The only overhead in the final kernel image and at runtime are a few extra bytes in 'struct hid_driver'. The same approach is chosen by 'struct usb_driver' and other subsystems. Signed-off-by: Thomas Weißschuh Link: https://lore.kernel.org/r/20231012-hid-pm_ptr-v1-1-0a71531ca93b@weissschuh.net Signed-off-by: Benjamin Tissoires --- diff --git a/include/linux/hid.h b/include/linux/hid.h index 964ca1f15e3f6..5a8387a4a7126 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -833,11 +833,11 @@ struct hid_driver { void (*feature_mapping)(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage); -#ifdef CONFIG_PM + int (*suspend)(struct hid_device *hdev, pm_message_t message); int (*resume)(struct hid_device *hdev); int (*reset_resume)(struct hid_device *hdev); -#endif + /* private: */ struct device_driver driver; };