wifi: rtw88: add RTW88_LEDS depends on LEDS_CLASS to Kconfig
Ping-Ke Shih
maintainerPATCH v2 1/1 wifi: rtw88: add RTW88_LEDS depends on LEDS_CLASS to Kconfig
When using allmodconfig, .config has CONFIG_LEDS_CLASS=m but autoconf.h has CONFIG_LEDS_CLASS_MODULE (additional suffix _MODULE) instead of CONFIG_LEDS_CLASS, which condition CONFIG_LEDS_CLASS in rtw88/led.h can't work properly.
Add RTW88_LEDS to Kconfig, and use it as condition to fix this problem.
drivers/net/wireless/realtek/rtw88/led.c:19:6: error: redefinition of 'rtw_led_init'
19 | void rtw_led_init(struct rtw_dev *rtwdev)
| ^~~~~~~~~~~~
In file included from drivers/net/wireless/realtek/rtw88/led.c:7:
drivers/net/wireless/realtek/rtw88/led.h:15:20: note: previous definition of 'rtw_led_init' with type 'void(struct rtw_dev *)'
15 | static inline void rtw_led_init(struct rtw_dev *rtwdev)
| ^~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/led.c:64:6: error: redefinition of 'rtw_led_deinit'
64 | void rtw_led_deinit(struct rtw_dev *rtwdev)
| ^~~~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/led.h:19:20: note: previous definition of 'rtw_led_deinit' with type 'void(struct rtw_dev *)'
19 | static inline void rtw_led_deinit(struct rtw_dev *rtwdev)
| ^~~~~~~~~~~~~~---
v2:
- add Reported-by and Closes
- use 'depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211'
--- drivers/net/wireless/realtek/rtw88/Kconfig | 5 +++++ drivers/net/wireless/realtek/rtw88/Makefile | 2 +- drivers/net/wireless/realtek/rtw88/led.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/Kconfig +5 -0
@@ -238,4 +238,9 @@ config RTW88_DEBUGFS If unsure, say Y to simplify debug problems +config RTW88_LEDS + bool + depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211 + default y + endif
drivers/net/wireless/realtek/rtw88/Makefile +1 -1
@@ -20,7 +20,7 @@ rtw88_core-y += main.o \ rtw88_core-$(CONFIG_PM) += wow.o -rtw88_core-$(CONFIG_LEDS_CLASS) += led.o +rtw88_core-$(CONFIG_RTW88_LEDS) += led.o obj-$(CONFIG_RTW88_8822B) += rtw88_8822b.o rtw88_8822b-objs := rtw8822b.o rtw8822b_table.o
drivers/net/wireless/realtek/rtw88/led.h +1 -1
@@ -5,7 +5,7 @@#ifndef __RTW_LED_H#define __RTW_LED_H -#ifdef CONFIG_LEDS_CLASS +#ifdef CONFIG_RTW88_LEDS void rtw_led_init (struct rtw_dev *rtwdev);void rtw_led_deinit (struct rtw_dev *rtwdev);
Signature · 1 line
2.25.1
Quoted 23 lines · Ping-Ke Shih
When using allmodconfig, .config has
CONFIG_LEDS_CLASS=mbutautoconf.hhasCONFIG_LEDS_CLASS_MODULE(additional suffix_MODULE) instead ofCONFIG_LEDS_CLASS, which conditionCONFIG_LEDS_CLASSinrtw88/led.hcan't work properly.Add
RTW88_LEDStoKconfig, and use it as condition to fix this problem.
drivers/net/wireless/realtek/rtw88/led.c:19:6: error: redefinition of 'rtw_led_init'
19 | voidrtw_led_init(struct rtw_dev *rtwdev)| ^~~~~~~~~~~~In file included from
drivers/net/wireless/realtek/rtw88/led.c:7:drivers/net/wireless/realtek/rtw88/led.h:15:20: note: previous definition of 'rtw_led_init' with type 'void(struct rtw_dev *)'
15 | static inline voidrtw_led_init(struct rtw_dev *rtwdev)| ^~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/led.c:64:6: error: redefinition of 'rtw_led_deinit' 64 | void rtw_led_deinit(struct rtw_dev *rtwdev) | ^~~~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/led.h:19:20: note: previous definition of 'rtw_led_deinit' with type 'void(struct rtw_dev *)' 19 | static inline void rtw_led_deinit(struct rtw_dev *rtwdev) | ^~~~~~~~~~~~~~
Quoted 5 lines
Reported-by Stephen Rothwell <[email protected]>Closes https://lore.kernel.org/linux-wireless/[email protected]/T/#me407832de1040ce22e53517bcb18e322ad0e2260 open hereFixes 4b6652bc6d8d ("wifi: rtw88: Add support for LED blinking")Cc Bitterblue Smith <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Thanks, looks good to me. I'm hoping to apply this to wireless-next still today so that it can be in tomorrow's linux-next build.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 21 lines · Ping-Ke Shih
When using allmodconfig, .config has
CONFIG_LEDS_CLASS=mbutautoconf.hhasCONFIG_LEDS_CLASS_MODULE(additional suffix_MODULE) instead ofCONFIG_LEDS_CLASS, which conditionCONFIG_LEDS_CLASSinrtw88/led.hcan't work properly.Add
RTW88_LEDStoKconfig, and use it as condition to fix this problem.
drivers/net/wireless/realtek/rtw88/led.c:19:6: error: redefinition of 'rtw_led_init'
19 | voidrtw_led_init(struct rtw_dev *rtwdev)| ^~~~~~~~~~~~ In file included from drivers/net/wireless/realtek/rtw88/led.c:7: drivers/net/wireless/realtek/rtw88/led.h:15:20: note: previous definition of 'rtw_led_init' with type 'void(struct rtw_dev *)' 15 | static inline void rtw_led_init(struct rtw_dev *rtwdev) | ^~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/led.c:64:6: error: redefinition of 'rtw_led_deinit' 64 | void rtw_led_deinit(struct rtw_dev *rtwdev) | ^~~~~~~~~~~~~~ drivers/net/wireless/realtek/rtw88/led.h:19:20: note: previous definition of 'rtw_led_deinit' with type 'void(struct rtw_dev *)' 19 | static inline void rtw_led_deinit(struct rtw_dev *rtwdev) | ^~~~~~~~~~~~~~
Quoted 5 lines
Reported-by Stephen Rothwell <[email protected]>Closes https://lore.kernel.org/linux-wireless/[email protected]/T/#me407832de1040ce22e53517bcb18e322ad0e2260 open hereFixes 4b6652bc6d8d ("wifi: rtw88: Add support for LED blinking")Cc Bitterblue Smith <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
b4bfbc50b1b9 wifi: rtw88: add RTW88_LEDS depends on LEDS_CLASS to Kconfig
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches