Skip to content

Commit b4bfbc5

Browse files
Ping-Ke ShihKalle Valo
authored andcommitted
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) | ^~~~~~~~~~~~~~ Reported-by: Stephen Rothwell <[email protected]> Closes: https://lore.kernel.org/linux-wireless/[email protected]/T/#me407832de1040ce22e53517bcb18e322ad0e2260 Fixes: 4b6652b ("wifi: rtw88: Add support for LED blinking") Cc: Bitterblue Smith <[email protected]> Signed-off-by: Ping-Ke Shih <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 89d62bc commit b4bfbc5

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

drivers/net/wireless/realtek/rtw88/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,4 +238,9 @@ config RTW88_DEBUGFS
238238

239239
If unsure, say Y to simplify debug problems
240240

241+
config RTW88_LEDS
242+
bool
243+
depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211
244+
default y
245+
241246
endif

drivers/net/wireless/realtek/rtw88/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rtw88_core-y += main.o \
2020

2121
rtw88_core-$(CONFIG_PM) += wow.o
2222

23-
rtw88_core-$(CONFIG_LEDS_CLASS) += led.o
23+
rtw88_core-$(CONFIG_RTW88_LEDS) += led.o
2424

2525
obj-$(CONFIG_RTW88_8822B) += rtw88_8822b.o
2626
rtw88_8822b-objs := rtw8822b.o rtw8822b_table.o

drivers/net/wireless/realtek/rtw88/led.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef __RTW_LED_H
66
#define __RTW_LED_H
77

8-
#ifdef CONFIG_LEDS_CLASS
8+
#ifdef CONFIG_RTW88_LEDS
99

1010
void rtw_led_init(struct rtw_dev *rtwdev);
1111
void rtw_led_deinit(struct rtw_dev *rtwdev);

0 commit comments

Comments
 (0)