From: matthias.bgg@kernel.org
To: Kalle Valo <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: brcm80211-dev-list.pdl@broadcom.com,
Chung-hsien Hsu <chung-hsien.hsu@infineon.com>,
netdev@vger.kernel.org,
Hante Meuleman <hante.meuleman@broadcom.com>,
linux-wireless@vger.kernel.org, Amar Shankar <amsr@cypress.com>,
ivan.ivanov@suse.com, linux-kernel@vger.kernel.org,
Dmitry Osipenko <digetx@gmail.com>,
SHA-cyfmac-dev-list@infineon.com,
Wright Feng <wright.feng@infineon.com>,
Remi Depommier <rde@setrix.com>,
Franky Lin <franky.lin@broadcom.com>,
Arend van Spriel <aspriel@gmail.com>,
dmueller@suse.de, Matthias Brugger <mbrugger@suse.com>,
"Gustavo A . R . Silva" <gustavoars@kernel.org>,
Chi-hsien Lin <chi-hsien.lin@infineon.com>,
Hans de Goede <hdegoede@redhat.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH] brcmfmac: Delete second brcm folder hierarchy
Date: Wed, 2 Jun 2021 16:43:05 +0200 [thread overview]
Message-ID: <20210602144305.4481-1-matthias.bgg@kernel.org> (raw)
From: Matthias Brugger <mbrugger@suse.com>
BRCMF_FW_DEFAULT_PATH already defines the brcm folder, delete the second
folder to match with Linux firmware repository layout.
Fixes: 75729e110e68 ("brcmfmac: expose firmware config files through modinfo")
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 16ed325795a8..b8788d7090a4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -626,8 +626,8 @@ BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");
/* firmware config files */
-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt");
-MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt");
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");
static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
--
2.31.1
next reply other threads:[~2021-06-02 14:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 14:43 matthias.bgg [this message]
2021-06-02 14:56 ` [PATCH] brcmfmac: Delete second brcm folder hierarchy Hans de Goede
2021-06-15 10:38 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210602144305.4481-1-matthias.bgg@kernel.org \
--to=matthias.bgg@kernel.org \
--cc=SHA-cyfmac-dev-list@infineon.com \
--cc=amsr@cypress.com \
--cc=aspriel@gmail.com \
--cc=bigeasy@linutronix.de \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=chi-hsien.lin@infineon.com \
--cc=chung-hsien.hsu@infineon.com \
--cc=davem@davemloft.net \
--cc=digetx@gmail.com \
--cc=dmueller@suse.de \
--cc=franky.lin@broadcom.com \
--cc=gustavoars@kernel.org \
--cc=hante.meuleman@broadcom.com \
--cc=hdegoede@redhat.com \
--cc=ivan.ivanov@suse.com \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mbrugger@suse.com \
--cc=netdev@vger.kernel.org \
--cc=rde@setrix.com \
--cc=wright.feng@infineon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).