Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b52b5061615b1aedf304845f3093afb283393e8a

Authored by Simon Wood
Committed by Jiri Kosina
1 parent c1e0ac192b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

HID: hid-steelseries fix led class build issue 

Fixes 'undefined reference' issue when hid-steelseries is built in,
but led-class is a module.
--
drivers/built-in.o: In function `steelseries_srws1_remove':
hid-steelseries.c:(.text+0x3b97a1): undefined reference to `led_classdev_unregister'
drivers/built-in.o: In function `steelseries_srws1_probe':
hid-steelseries.c:(.text+0x3b9c51): undefined reference to `led_classdev_register'
hid-steelseries.c:(.text+0x3b9ce5): undefined reference to `led_classdev_register'
hid-steelseries.c:(.text+0x3b9d4b): undefined reference to `led_classdev_unregister'
--

Patch allows LED control when led-class is built in, or both hid-steelseries
_and_ led-class are both modules.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Simon Wood <simon@mungewell.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff

drivers/hid/hid-steelseries.c
Diff comments   View file @ b52b506
... ... @@ -18,7 +18,8 @@
18 18  
19 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 23 #define SRWS1_NUMBER_LEDS 15
23 24 struct steelseries_srws1_data {
24 25 __u16 led_state;
... ... @@ -107,7 +108,8 @@
107 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 113 static void steelseries_srws1_set_leds(struct hid_device *hdev, __u16 leds)
112 114 {
113 115 struct list_head *report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
... ... @@ -370,7 +372,8 @@
370 372 static struct hid_driver steelseries_srws1_driver = {
371 373 .name = "steelseries_srws1",
372 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 377 .probe = steelseries_srws1_probe,
375 378 .remove = steelseries_srws1_remove,
376 379 #endif