diff options
-rw-r--r-- | drivers/hid/hid-steelseries.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c index 9b0efb0083fe..d16491192112 100644 --- a/drivers/hid/hid-steelseries.c +++ b/drivers/hid/hid-steelseries.c | |||
@@ -18,7 +18,8 @@ | |||
18 | 18 | ||
19 | #include "hid-ids.h" | 19 | #include "hid-ids.h" |
20 | 20 | ||
21 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) | 21 | #if IS_BUILTIN(CONFIG_LEDS_CLASS) || \ |
22 | (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES)) | ||
22 | #define SRWS1_NUMBER_LEDS 15 | 23 | #define SRWS1_NUMBER_LEDS 15 |
23 | struct steelseries_srws1_data { | 24 | struct steelseries_srws1_data { |
24 | __u16 led_state; | 25 | __u16 led_state; |
@@ -107,7 +108,8 @@ static __u8 steelseries_srws1_rdesc_fixed[] = { | |||
107 | 0xC0 /* End Collection */ | 108 | 0xC0 /* End Collection */ |
108 | }; | 109 | }; |
109 | 110 | ||
110 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) | 111 | #if IS_BUILTIN(CONFIG_LEDS_CLASS) || \ |
112 | (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES)) | ||
111 | static void steelseries_srws1_set_leds(struct hid_device *hdev, __u16 leds) | 113 | static void steelseries_srws1_set_leds(struct hid_device *hdev, __u16 leds) |
112 | { | 114 | { |
113 | struct list_head *report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list; | 115 | struct list_head *report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list; |
@@ -370,7 +372,8 @@ MODULE_DEVICE_TABLE(hid, steelseries_srws1_devices); | |||
370 | static struct hid_driver steelseries_srws1_driver = { | 372 | static struct hid_driver steelseries_srws1_driver = { |
371 | .name = "steelseries_srws1", | 373 | .name = "steelseries_srws1", |
372 | .id_table = steelseries_srws1_devices, | 374 | .id_table = steelseries_srws1_devices, |
373 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) | 375 | #if IS_BUILTIN(CONFIG_LEDS_CLASS) || \ |
376 | (IS_MODULE(CONFIG_LEDS_CLASS) && IS_MODULE(CONFIG_HID_STEELSERIES)) | ||
374 | .probe = steelseries_srws1_probe, | 377 | .probe = steelseries_srws1_probe, |
375 | .remove = steelseries_srws1_remove, | 378 | .remove = steelseries_srws1_remove, |
376 | #endif | 379 | #endif |