From patchwork Thu Jul 22 10:54:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 483877 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp243340jao; Thu, 22 Jul 2021 03:55:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbo21c72YywIYotlHTSqBOgBKdcP7/KToUXnNDK8vrZGEI+nZcNt7I2EpfBNhi8DppUMKA X-Received: by 2002:a05:6402:1a3c:: with SMTP id be28mr53305030edb.15.1626951311540; Thu, 22 Jul 2021 03:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626951311; cv=none; d=google.com; s=arc-20160816; b=VJIqj1BZGCfj2wGINfJXiRRlTQSv0iuEXE2omwF03DRkUXvY/GQDiNEnJIESPub6Vr w22/XtiFdCKVqWPHLVMV4YJWZqseHlHm3dQlzaVINc4ivNCDDGL5M0kLGZXoa9qCPRRF h85eQW3GAzu1Bwjycey+PKfA1OwqXoAkRP5LaT1tMvjGGrKLAK1RJjOSrSH0twoICRb/ RjlLz0lComdRLNZ8X1XFH06fgoIEYgDzGuqmEz+5Hp11+9sA8Ddyo+IOnZpu5xzr03XJ giUnoVj2P7vO4M1y4ZzeieH257fN20mwwzpwmFk1H2qiznCiyzpBoB3/NPhv9m7jbFOr /zlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=I7aLzkKIDNdeiV4ZJfdx3YS2GLHwWWC16Nr+PqOPV3A=; b=J+EOn+yz3wg1BDUGgn6xZ9ZifA6sEH2yB1jB+/mhsOwfq91ENjBI8tD9T9NcdT3++/ Snyd11ON853fa4LpNYvwwj2JYXgbJh4+YhYrq4cM3pamo53nL7eh9aiijVQQxNilBfiR MsMKAAsw91IMUcIDBKbHnTipqo15xsFUytrZaD/qQiFniTBWJ7buj7MXddq98VTY6gMl PT7Hf7swELTXFywjfpr8vu8of0dR62OprB+cNsYKXX7pRbVwxQVt7ovEA4C7C2zf+Z3z 0VUGQtxLKmdVHwFzdYAO2GD26TYY3Blw2A5HhhW+1PEWWbFtZFhKHRfQN07QO9VrKJZN hL8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tJS6H2ra; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bu15si15358270ejb.164.2021.07.22.03.55.11; Thu, 22 Jul 2021 03:55:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tJS6H2ra; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231579AbhGVKOb (ORCPT + 2 others); Thu, 22 Jul 2021 06:14:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:36028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231453AbhGVKOb (ORCPT ); Thu, 22 Jul 2021 06:14:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 10ACB60FF2; Thu, 22 Jul 2021 10:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626951306; bh=BJ6APhf3RzDbaRx9MSskmKukvlPphUZjkNXAiCLjq4U=; h=From:To:Cc:Subject:Date:From; b=tJS6H2raoggEzh/mOaRoAOyvnEvMH57PAQXqTQ7G1iQeQk6jp5JoZOjYupmVbzTt4 LrObS2Rf0tmov1bl59+wmqC+UO0vcN4IdgI9b6v5T90iNWgxV/NIjoaRqZaHBUy2n+ hx98jCTyUah9HfLz927v588OnDw5qI0POpV1Y3dCx61TN7ua+H+eVG1S/bzZ3Skd+T HcybZomMzitJHpskL8JFWx6PACzq++Lajp5pJUTBPTKWb4uXCpIaevB7mLRSxU9xIq qFdJfU8S8F1FM8ukEPBSH4FztIYCngfZ90hqEQ8lzov4WXOknIAgEYeRO/mxVVwX51 4M6PBGbiocQAA== From: Arnd Bergmann To: Jiri Slaby , Nick Kossifidis , Luis Chamberlain , Kalle Valo Cc: Arnd Bergmann , "David S. Miller" , Jakub Kicinski , Johannes Berg , Krzysztof Kozlowski , Bob Copeland , "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ath5k: fix building with LEDS=m Date: Thu, 22 Jul 2021 12:54:46 +0200 Message-Id: <20210722105501.1000781-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Arnd Bergmann Randconfig builds still show a failure for the ath5k driver, similar to the one that was fixed for ath9k earlier: WARNING: unmet direct dependencies detected for MAC80211_LEDS Depends on [n]: NET [=y] && WIRELESS [=y] && MAC80211 [=y] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=MAC80211 [=y]) Selected by [m]: - ATH5K [=m] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && (PCI [=y] || ATH25) && MAC80211 [=y] net/mac80211/led.c: In function 'ieee80211_alloc_led_names': net/mac80211/led.c:34:22: error: 'struct led_trigger' has no member named 'name' 34 | local->rx_led.name = kasprintf(GFP_KERNEL, "%srx", | ^ Copying the same logic from my ath9k patch makes this one work as well. Alternatively, we could just drop the 'select' from both ath5k and ath9k. Fixes: b64acb28da83 ("ath9k: fix build error with LEDS_CLASS=m") Fixes: 72cdab808714 ("ath9k: Do not select MAC80211_LEDS by default") Fixes: 3a078876caee ("ath5k: convert LED code to use mac80211 triggers") Signed-off-by: Arnd Bergmann --- drivers/net/wireless/ath/ath5k/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.29.2 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig index f35cd8de228e..6914b37bb0fb 100644 --- a/drivers/net/wireless/ath/ath5k/Kconfig +++ b/drivers/net/wireless/ath/ath5k/Kconfig @@ -3,9 +3,7 @@ config ATH5K tristate "Atheros 5xxx wireless cards support" depends on (PCI || ATH25) && MAC80211 select ATH_COMMON - select MAC80211_LEDS - select LEDS_CLASS - select NEW_LEDS + select MAC80211_LEDS if LEDS_CLASS=y || LEDS_CLASS=MAC80211 select ATH5K_AHB if ATH25 select ATH5K_PCI if !ATH25 help