Commit f3548721 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Benjamin Tissoires

HID: usbhid: remove #ifdef CONFIG_PM

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.
Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20231012-hid-pm_ptr-v1-2-0a71531ca93b@weissschuh.netSigned-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent df8b030d
...@@ -1562,7 +1562,6 @@ static int hid_post_reset(struct usb_interface *intf) ...@@ -1562,7 +1562,6 @@ static int hid_post_reset(struct usb_interface *intf)
return 0; return 0;
} }
#ifdef CONFIG_PM
static int hid_resume_common(struct hid_device *hid, bool driver_suspended) static int hid_resume_common(struct hid_device *hid, bool driver_suspended)
{ {
int status = 0; int status = 0;
...@@ -1654,8 +1653,6 @@ static int hid_reset_resume(struct usb_interface *intf) ...@@ -1654,8 +1653,6 @@ static int hid_reset_resume(struct usb_interface *intf)
return status; return status;
} }
#endif /* CONFIG_PM */
static const struct usb_device_id hid_usb_ids[] = { static const struct usb_device_id hid_usb_ids[] = {
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
.bInterfaceClass = USB_INTERFACE_CLASS_HID }, .bInterfaceClass = USB_INTERFACE_CLASS_HID },
...@@ -1668,11 +1665,9 @@ static struct usb_driver hid_driver = { ...@@ -1668,11 +1665,9 @@ static struct usb_driver hid_driver = {
.name = "usbhid", .name = "usbhid",
.probe = usbhid_probe, .probe = usbhid_probe,
.disconnect = usbhid_disconnect, .disconnect = usbhid_disconnect,
#ifdef CONFIG_PM .suspend = pm_ptr(hid_suspend),
.suspend = hid_suspend, .resume = pm_ptr(hid_resume),
.resume = hid_resume, .reset_resume = pm_ptr(hid_reset_resume),
.reset_resume = hid_reset_resume,
#endif
.pre_reset = hid_pre_reset, .pre_reset = hid_pre_reset,
.post_reset = hid_post_reset, .post_reset = hid_post_reset,
.id_table = hid_usb_ids, .id_table = hid_usb_ids,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment