mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 20:54:10 +08:00
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: Thomas Weißschuh <linux@weissschuh.net> Link: https://lore.kernel.org/r/20231012-hid-pm_ptr-v1-2-0a71531ca93b@weissschuh.net Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
This commit is contained in:
parent
df8b030d82
commit
f354872108
@ -1562,7 +1562,6 @@ static int hid_post_reset(struct usb_interface *intf)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int hid_resume_common(struct hid_device *hid, bool driver_suspended)
|
||||
{
|
||||
int status = 0;
|
||||
@ -1654,8 +1653,6 @@ static int hid_reset_resume(struct usb_interface *intf)
|
||||
return status;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
static const struct usb_device_id hid_usb_ids[] = {
|
||||
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
|
||||
.bInterfaceClass = USB_INTERFACE_CLASS_HID },
|
||||
@ -1668,11 +1665,9 @@ static struct usb_driver hid_driver = {
|
||||
.name = "usbhid",
|
||||
.probe = usbhid_probe,
|
||||
.disconnect = usbhid_disconnect,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = hid_suspend,
|
||||
.resume = hid_resume,
|
||||
.reset_resume = hid_reset_resume,
|
||||
#endif
|
||||
.suspend = pm_ptr(hid_suspend),
|
||||
.resume = pm_ptr(hid_resume),
|
||||
.reset_resume = pm_ptr(hid_reset_resume),
|
||||
.pre_reset = hid_pre_reset,
|
||||
.post_reset = hid_post_reset,
|
||||
.id_table = hid_usb_ids,
|
||||
|
Loading…
Reference in New Issue
Block a user