HID: multitouch: remove #ifdef CONFIG_PM
authorThomas Weißschuh <linux@weissschuh.net>
Thu, 12 Oct 2023 10:23:40 +0000 (12:23 +0200)
committerBenjamin Tissoires <bentiss@kernel.org>
Wed, 25 Oct 2023 16:33:42 +0000 (18:33 +0200)
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-3-0a71531ca93b@weissschuh.net
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/hid-multitouch.c

index 8db4ae05febc8f069528cb79095b44d97e83159b..e098cc7b3944375387bb8003ca6ab4807bfb3eb9 100644 (file)
@@ -1802,7 +1802,6 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        return 0;
 }
 
-#ifdef CONFIG_PM
 static int mt_suspend(struct hid_device *hdev, pm_message_t state)
 {
        struct mt_device *td = hid_get_drvdata(hdev);
@@ -1836,7 +1835,6 @@ static int mt_resume(struct hid_device *hdev)
 
        return 0;
 }
-#endif
 
 static void mt_remove(struct hid_device *hdev)
 {
@@ -2259,10 +2257,8 @@ static struct hid_driver mt_driver = {
        .usage_table = mt_grabbed_usages,
        .event = mt_event,
        .report = mt_report,
-#ifdef CONFIG_PM
-       .suspend = mt_suspend,
-       .reset_resume = mt_reset_resume,
-       .resume = mt_resume,
-#endif
+       .suspend = pm_ptr(mt_suspend),
+       .reset_resume = pm_ptr(mt_reset_resume),
+       .resume = pm_ptr(mt_resume),
 };
 module_hid_driver(mt_driver);