[v2] mt76: fix building without CONFIG_LEDS_CLASS

Message ID 33a74f5182ddf9bf90c883884924dc93547a5fb4.1541432864.git.lorenzo.bianconi@redhat.com
State New
Headers show
Series
  • [v2] mt76: fix building without CONFIG_LEDS_CLASS
Related show

Commit Message

Lorenzo Bianconi Nov. 5, 2018, 3:51 p.m.
From: Arnd Bergmann <arnd@arndb.de>


When CONFIG_LEDS_CLASS is disabled, or it is a loadable module while
mt76 is built-in, we run into a link error:

drivers/net/wireless/mediatek/mt76/mac80211.o: In function `mt76_register_device':
mac80211.c:(.text+0xb78): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `devm_of_led_classdev_register'

We don't really need a hard dependency here as the driver can presumably
work just fine without LEDs, so this follows the iwlwifi example and
adds a separate Kconfig option for the LED support, this will be available
whenever it will link, and otherwise the respective code gets left out from
the driver object.

Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

---
Changes since v1:
- rebased on top of wireless-drivers repository
---
 drivers/net/wireless/mediatek/mt76/Kconfig           | 6 ++++++
 drivers/net/wireless/mediatek/mt76/mac80211.c        | 8 +++++---
 drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c | 6 ++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

-- 
2.17.2

Comments

Kalle Valo Nov. 6, 2018, 4:47 p.m. | #1
Lorenzo Bianconi <lorenzo.bianconi@redhat.com> wrote:

> From: Arnd Bergmann <arnd@arndb.de>

> 

> When CONFIG_LEDS_CLASS is disabled, or it is a loadable module while

> mt76 is built-in, we run into a link error:

> 

> drivers/net/wireless/mediatek/mt76/mac80211.o: In function `mt76_register_device':

> mac80211.c:(.text+0xb78): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `devm_of_led_classdev_register'

> 

> We don't really need a hard dependency here as the driver can presumably

> work just fine without LEDs, so this follows the iwlwifi example and

> adds a separate Kconfig option for the LED support, this will be available

> whenever it will link, and otherwise the respective code gets left out from

> the driver object.

> 

> Fixes: 17f1de56df05 ("mt76: add common code shared between multiple chipsets")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>


Patch applied to wireless-drivers.git, thanks.

b374e8686fc3 mt76: fix building without CONFIG_LEDS_CLASS

-- 
https://patchwork.kernel.org/patch/10668565/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig
index 0ccbcd7e887d..c30d8f5bbf2a 100644
--- a/drivers/net/wireless/mediatek/mt76/Kconfig
+++ b/drivers/net/wireless/mediatek/mt76/Kconfig
@@ -1,6 +1,12 @@ 
 config MT76_CORE
 	tristate
 
+config MT76_LEDS
+	bool
+	depends on MT76_CORE
+	depends on LEDS_CLASS=y || MT76_CORE=LEDS_CLASS
+	default y
+
 config MT76_USB
 	tristate
 	depends on MT76_CORE
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 2a699e8b79bf..7d219ff2d480 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -345,9 +345,11 @@  int mt76_register_device(struct mt76_dev *dev, bool vht,
 	mt76_check_sband(dev, NL80211_BAND_2GHZ);
 	mt76_check_sband(dev, NL80211_BAND_5GHZ);
 
-	ret = mt76_led_init(dev);
-	if (ret)
-		return ret;
+	if (IS_ENABLED(CONFIG_MT76_LEDS)) {
+		ret = mt76_led_init(dev);
+		if (ret)
+			return ret;
+	}
 
 	return ieee80211_register_hw(hw);
 }
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 3824290b219d..fd125722d1fb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -507,8 +507,10 @@  int mt76x2_register_device(struct mt76x02_dev *dev)
 	mt76x2_dfs_init_detector(dev);
 
 	/* init led callbacks */
-	dev->mt76.led_cdev.brightness_set = mt76x2_led_set_brightness;
-	dev->mt76.led_cdev.blink_set = mt76x2_led_set_blink;
+	if (IS_ENABLED(CONFIG_MT76_LEDS)) {
+		dev->mt76.led_cdev.brightness_set = mt76x2_led_set_brightness;
+		dev->mt76.led_cdev.blink_set = mt76x2_led_set_blink;
+	}
 
 	ret = mt76_register_device(&dev->mt76, true, mt76x02_rates,
 				   ARRAY_SIZE(mt76x02_rates));