Merge tag 'wireless-drivers-for-davem-2018-01-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 4.15

One last set of fixes for regression submitted during the last few days.

bcma & ssb

* fix older build problems which (apparently) recently became more
  frequent in certain MIPS configurations

brcmfmac

* continue driver initialisation even if CLM blob (firmware) file is
  not found
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 5 insertions, 8 deletions

diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index 02d78f6cecbb..ba8acca036df 100644
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
@@ -55,7 +55,7 @@ config BCMA_DRIVER_PCI
 
 config BCMA_DRIVER_PCI_HOSTMODE
         bool "Driver for PCI core working in hostmode"
-        depends on MIPS && BCMA_DRIVER_PCI
+        depends on MIPS && BCMA_DRIVER_PCI && PCI_DRIVERS_LEGACY
         help
           PCI core hostmode operation (external PCI bus).
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 6a59d0609d30..9be0b051066a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -182,12 +182,9 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
 
         err = request_firmware(&clm, clm_name, dev);
         if (err) {
-                if (err == -ENOENT) {
-                        brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n");
-                        return 0;
-                }
-                brcmf_err("request CLM blob file failed (%d)\n", err);
-                return err;
+                brcmf_info("no clm_blob available(err=%d), device may have limited channels available\n",
+                           err);
+                return 0;
         }
 
         chunk_buf = kzalloc(sizeof(*chunk_buf) + MAX_CHUNK_LEN - 1, GFP_KERNEL);
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index d8e4219c2324..71c73766ee22 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -32,7 +32,7 @@ config SSB_BLOCKIO
 
 config SSB_PCIHOST_POSSIBLE
         bool
-        depends on SSB && (PCI = y || PCI = SSB)
+        depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY
         default y
 
 config SSB_PCIHOST