Revert "brcmfmac: Read alternative firmware names from DT"

[platform/kernel/linux-rpi.git] / drivers / net / wireless / broadcom / brcm80211 / brcmfmac / sdio.c

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index feecc51..6d979ab 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -35,7 +35,6 @@
 #include "core.h"
 #include "common.h"
 #include "bcdc.h"
-#include "of.h"
 
 #define DCMD_RESP_TIMEOUT      msecs_to_jiffies(2500)
 #define CTL_DONE_TIMEOUT       msecs_to_jiffies(2500)
@@ -4417,9 +4416,7 @@ fail:
 }
 
 static struct brcmf_fw_request *
-brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus,
-                             const struct brcmf_firmware_mapping *fwmap,
-                             int fwmap_count)
+brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus)
 {
        struct brcmf_fw_request *fwreq;
        struct brcmf_fw_name fwnames[] = {
@@ -4429,7 +4426,8 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus,
        };
 
        fwreq = brcmf_fw_alloc_request(bus->ci->chip, bus->ci->chiprev,
-                                      fwmap, fwmap_count,
+                                      brcmf_sdio_fwnames,
+                                      ARRAY_SIZE(brcmf_sdio_fwnames),
                                       fwnames, ARRAY_SIZE(fwnames));
        if (!fwreq)
                return NULL;
@@ -4443,44 +4441,12 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus,
        return fwreq;
 }
 
-static void brcmf_sdio_of_firmware_callback(struct device *dev, int err,
-                                           struct brcmf_fw_request *fwreq)
-{
-       struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-       struct brcmf_sdio_dev *sdiod = bus_if->bus_priv.sdio;
-       struct brcmf_sdio *bus = sdiod->bus;
-
-       brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
-
-       if (err) {
-               /* Try again with the standard firmware names */
-               kfree(fwreq);
-               fwreq = brcmf_sdio_prepare_fw_request(bus,
-                                                     brcmf_sdio_fwnames,
-                                                     ARRAY_SIZE(brcmf_sdio_fwnames));
-               if (!fwreq) {
-                       err = -ENOMEM;
-                       goto fail;
-               }
-
-               err = brcmf_fw_get_firmwares(sdiod->dev, fwreq,
-                                    brcmf_sdio_firmware_callback);
-               if (!err)
-                       return;
-       }
-
-fail:
-       brcmf_sdio_firmware_callback(dev, err, fwreq);
-}
-
 struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
 {
        int ret;
        struct brcmf_sdio *bus;
        struct workqueue_struct *wq;
        struct brcmf_fw_request *fwreq;
-       struct brcmf_firmware_mapping *of_fwnames;
-       u32 of_fwcount;
 
        brcmf_dbg(TRACE, "Enter\n");
 
@@ -4563,23 +4529,13 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
 
        brcmf_dbg(INFO, "completed!!\n");
 
-       of_fwnames = brcmf_of_fwnames(sdiodev->dev, &of_fwcount);
-
-       if (of_fwnames)
-               fwreq = brcmf_sdio_prepare_fw_request(bus, of_fwnames,
-                                                     of_fwcount);
-       else
-               fwreq = brcmf_sdio_prepare_fw_request(bus, brcmf_sdio_fwnames,
-                                                     ARRAY_SIZE(brcmf_sdio_fwnames));
-
+       fwreq = brcmf_sdio_prepare_fw_request(bus);
        if (!fwreq) {
                ret = -ENOMEM;
                goto fail;
        }
 
        ret = brcmf_fw_get_firmwares(sdiodev->dev, fwreq,
-                                    of_fwnames ?
-                                    brcmf_sdio_of_firmware_callback :
                                     brcmf_sdio_firmware_callback);
        if (ret != 0) {
                brcmf_err("async firmware request failed: %d\n", ret);