lkml.org 
[lkml]   [2018]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 007/118] mt76: fix building without CONFIG_LEDS_CLASS
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit b374e8686fc35ae124e62dc78725ea656ba1ef8a ]

    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>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/Kconfig | 6 ++++++
    drivers/net/wireless/mediatek/mt76/mac80211.c | 8 +++++---
    drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 6 ++++--
    3 files changed, 15 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig
    index b6c5f17dca30..27826217ff76 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 029d54bce9e8..ade4a2029a24 100644
    --- a/drivers/net/wireless/mediatek/mt76/mac80211.c
    +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
    @@ -342,9 +342,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_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
    index b814391f79ac..03b103c45d69 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init.c
    @@ -581,8 +581,10 @@ int mt76x2_register_device(struct mt76x2_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, mt76x2_rates,
    ARRAY_SIZE(mt76x2_rates));
    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-11 17:05    [W:4.515 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site