staging: brcm80211: reorg brcms_c_validboardtype for clarity

The structure of the function made it difficult to understand, so reorganize it
to make it clearer.

Reported-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/bmac.c b/drivers/staging/brcm80211/brcmsmac/bmac.c
index f44f581068a4453aee24d9fa3cc19bf52a6e60eb..4a220d4ed7e1235391ac7e27d0e864346a1954d2 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/bmac.c
@@ -1905,28 +1905,33 @@ static bool brcms_c_isgoodchip(struct brcms_c_hw_info *wlc_hw)
        return true;
 }
 
+/* Validate some board info parameters */
 static bool brcms_c_validboardtype(struct brcms_c_hw_info *wlc_hw)
 {
-       bool goodboard = true;
        uint boardrev = wlc_hw->boardrev;
 
+       /* 4 bits each for board type, major, minor, and tiny version */
+       uint brt = (boardrev & 0xf000) >> 12;
+       uint b0 = (boardrev & 0xf00) >> 8;
+       uint b1 = (boardrev & 0xf0) >> 4;
+       uint b2 = boardrev & 0xf;
+
+       /* voards from other vendors are always considered valid */
+       if (wlc_hw->sih->boardvendor != PCI_VENDOR_ID_BROADCOM)
+               return true;
+
+       /* do some boardrev sanity checks when boardvendor is Broadcom */
        if (boardrev == 0)
-               goodboard = false;
-       else if (boardrev > 0xff) {
-               uint brt = (boardrev & 0xf000) >> 12;
-               uint b0 = (boardrev & 0xf00) >> 8;
-               uint b1 = (boardrev & 0xf0) >> 4;
-               uint b2 = boardrev & 0xf;
+               return false;
 
-               if ((brt > 2) || (brt == 0) || (b0 > 9) || (b0 == 0) || (b1 > 9)
-                   || (b2 > 9))
-                       goodboard = false;
-       }
+       if (boardrev <= 0xff)
+               return true;
 
-       if (wlc_hw->sih->boardvendor != PCI_VENDOR_ID_BROADCOM)
-               return goodboard;
+       if ((brt > 2) || (brt == 0) || (b0 > 9) || (b0 == 0) || (b1 > 9)
+               || (b2 > 9))
+               return false;
 
-       return goodboard;
+       return true;
 }
 
 static char *brcms_c_get_macaddr(struct brcms_c_hw_info *wlc_hw)