[PATCH 12/21] brcmfmac: Fix awfully named #define and crap multi-stage if...elseif clause.

[Ian Molton]

---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c    | 11 +++++++----
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
index 05f22ff81d60..7b8ba7192e1a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
@@ -30,7 +30,7 @@
 
 /* SOC Interconnect types (aka chip types) */
 #define SOCI_SB                0
-#define SOCI_AI                1
+#define SOCI_AXI       1
 
 /* PL-368 DMP definitions */
 #define DMP_DESC_TYPE_MSK      0x0000000F
@@ -927,7 +927,8 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv 
*ci)
                  socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name,
                  ci->pub.chiprev);
 
-       if (socitype == SOCI_SB) {
+       switch(socitype) {
+               case SOCI_SB:
                if (ci->pub.chip != BRCM_CC_4329_CHIP_ID) {
                        brcmf_err("SB chip is not supported\n");
                        return -ENODEV;
@@ -951,13 +952,15 @@ static int brcmf_chip_recognition(struct brcmf_chip_priv 
*ci)
 
                core = brcmf_chip_add_core(ci, BCMA_CORE_80211, 0x18001000, 0);
                brcmf_chip_sb_corerev(ci, core);
-       } else if (socitype == SOCI_AI) {
+               break;
+       case SOCI_AXI:
                ci->iscoreup = brcmf_chip_ai_iscoreup;
                ci->coredisable = brcmf_chip_ai_coredisable;
                ci->resetcore = brcmf_chip_ai_resetcore;
 
                brcmf_chip_dmp_erom_scan(ci);
-       } else {
+               break;
+       default:
                brcmf_err("chip backplane type %u is not supported\n",
                          socitype);
                return -ENODEV;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h 
b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h
index 2d08c155c23b..58f2d6e01f13 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h
@@ -44,7 +44,8 @@
 #define        SI_CC_IDX               0
 
 /* SOC Interconnect types (aka chip types) */
-#define        SOCI_AI                 1
+//FIXME - this is multiply defined!
+#define        SOCI_AXI                        1
 
 /* A register that is common to all cores to
  * communicate w/PMU regarding clock control.
-- 
2.11.0