Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: brcm: fix compilation warning for unused brcmf_of_fwnames

Browse source 
If CPTCFG_BRCMFMAC_SDIO is not used brcmf_of_fwnames is defined but not
used in the case of CONFIG_OF not compiled.

Restrict brcmf_of_fwnames only with CPTCFG_BRCMFMAC_SDIO selected.
Fix compilation warning:
/__w/openwrt/openwrt/openwrt/build_dir/target-x86_64-openwrt-linux-musl_musl/linux-x86_64/backports-6.1.24/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h:16:1: error: 'brcmf_of_fwnames' defined but not used [-Werror=unused-function]
   16 | brcmf_of_fwnames(struct device *dev, u32 *map_count)
      | ^~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-05-06 19:28:36 +02:00
parent 5180469394
commit b545df5cfd
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kernel/mac80211/patches/brcm/865-brcmfmac-Read-alternative-firmware-names-from-DT.patch
View file

@ -65,22 +65,26 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+} +}
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
@@ -5,9 +5,16 @@ @@ -5,9 +5,20 @@
#ifdef CONFIG_OF #ifdef CONFIG_OF
void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
struct brcmf_mp_device *settings); struct brcmf_mp_device *settings);
+#ifdef CPTCFG_BRCMFMAC_SDIO
+struct brcmf_firmware_mapping * +struct brcmf_firmware_mapping *
+brcmf_of_fwnames(struct device *dev, u32 *map_count); +brcmf_of_fwnames(struct device *dev, u32 *map_count);
+#endif
#else #else
static void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, static void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
struct brcmf_mp_device *settings) struct brcmf_mp_device *settings)
{ {
} }
+#ifdef CPTCFG_BRCMFMAC_SDIO
+static struct brcmf_firmware_mapping * +static struct brcmf_firmware_mapping *
+brcmf_of_fwnames(struct device *dev, u32 *map_count) +brcmf_of_fwnames(struct device *dev, u32 *map_count)
+{ +{
+ return NULL; + return NULL;
+} +}
+#endif
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c