* [PATCH] brcmfmac: Delete second brcm folder hierarchy
@ 2021-06-02 14:43 matthias.bgg
2021-06-02 14:56 ` Hans de Goede
2021-06-15 10:38 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: matthias.bgg @ 2021-06-02 14:43 UTC (permalink / raw)
To: Kalle Valo, David S . Miller, Jakub Kicinski
Cc: brcm80211-dev-list.pdl, Chung-hsien Hsu, netdev, Hante Meuleman,
linux-wireless, Amar Shankar, ivan.ivanov, linux-kernel,
Dmitry Osipenko, SHA-cyfmac-dev-list, Wright Feng, Remi Depommier,
Franky Lin, Arend van Spriel, dmueller, Matthias Brugger,
Gustavo A . R . Silva, Chi-hsien Lin, Hans de Goede,
Sebastian Andrzej Siewior
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] brcmfmac: Delete second brcm folder hierarchy
2021-06-02 14:43 [PATCH] brcmfmac: Delete second brcm folder hierarchy matthias.bgg
@ 2021-06-02 14:56 ` Hans de Goede
2021-06-15 10:38 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2021-06-02 14:56 UTC (permalink / raw)
To: matthias.bgg, Kalle Valo, David S . Miller, Jakub Kicinski
Cc: brcm80211-dev-list.pdl, Chung-hsien Hsu, netdev, Hante Meuleman,
linux-wireless, Amar Shankar, ivan.ivanov, linux-kernel,
Dmitry Osipenko, SHA-cyfmac-dev-list, Wright Feng, Remi Depommier,
Franky Lin, Arend van Spriel, dmueller, Matthias Brugger,
Gustavo A . R . Silva, Chi-hsien Lin, Sebastian Andrzej Siewior
Hi,
On 6/2/21 4:43 PM, matthias.bgg@kernel.org wrote:
> 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>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
>
> ---
>
> 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),
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] brcmfmac: Delete second brcm folder hierarchy
2021-06-02 14:43 [PATCH] brcmfmac: Delete second brcm folder hierarchy matthias.bgg
2021-06-02 14:56 ` Hans de Goede
@ 2021-06-15 10:38 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2021-06-15 10:38 UTC (permalink / raw)
To: matthias.bgg
Cc: David S . Miller, Jakub Kicinski, brcm80211-dev-list.pdl,
Chung-hsien Hsu, netdev, Hante Meuleman, linux-wireless,
Amar Shankar, ivan.ivanov, linux-kernel, Dmitry Osipenko,
SHA-cyfmac-dev-list, Wright Feng, Remi Depommier, Franky Lin,
Arend van Spriel, dmueller, Matthias Brugger,
Gustavo A . R . Silva, Chi-hsien Lin, Hans de Goede,
Sebastian Andrzej Siewior
matthias.bgg@kernel.org wrote:
> 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>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Patch applied to wireless-drivers-next.git, thanks.
4a26aafe4886 brcmfmac: Delete second brcm folder hierarchy
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210602144305.4481-1-matthias.bgg@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-15 10:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-02 14:43 [PATCH] brcmfmac: Delete second brcm folder hierarchy matthias.bgg
2021-06-02 14:56 ` Hans de Goede
2021-06-15 10:38 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox