ssb: remove rev from boardinfo

Previously the rev contained the revision read from the pci config
space and was used as board_rev in the wireless drivers. This is wrong
the board_rev is only fetched from the sprom accordingly to the open
source part of the Broadcom SDK and brcmsmac. This patch removes the
rev from the boardinfo structure and uses the board_rev attribute from
sprom instead. This attribute is filled by PCI, PCMCIA, SDIO and SoC
code.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43legacy/radio.c b/drivers/net/wireless/b43legacy/radio.c
index fcbafcd603cc..896177690394 100644
--- a/drivers/net/wireless/b43legacy/radio.c
+++ b/drivers/net/wireless/b43legacy/radio.c
@@ -1998,7 +1998,7 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev)
                         if (phy->type == B43legacy_PHYTYPE_G) {
                                 if (is_bcm_board_vendor(dev) &&
                                     dev->dev->bus->boardinfo.type == 0x421 &&
-                                    dev->dev->bus->boardinfo.rev >= 30)
+                                    dev->dev->bus->sprom.board_rev >= 30)
                                         att = 3;
                                 else if (is_bcm_board_vendor(dev) &&
                                          dev->dev->bus->boardinfo.type == 0x416)
@@ -2008,7 +2008,7 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev)
                         } else {
                                 if (is_bcm_board_vendor(dev) &&
                                     dev->dev->bus->boardinfo.type == 0x421 &&
-                                    dev->dev->bus->boardinfo.rev >= 30)
+                                    dev->dev->bus->sprom.board_rev >= 30)
                                         att = 7;
                                 else
                                         att = 6;
@@ -2018,7 +2018,7 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev)
                         if (phy->type == B43legacy_PHYTYPE_G) {
                                 if (is_bcm_board_vendor(dev) &&
                                     dev->dev->bus->boardinfo.type == 0x421 &&
-                                    dev->dev->bus->boardinfo.rev >= 30)
+                                    dev->dev->bus->sprom.board_rev >= 30)
                                         att = 3;
                                 else if (is_bcm_board_vendor(dev) &&
                                          dev->dev->bus->boardinfo.type ==
@@ -2052,9 +2052,9 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev)
         }
         if (is_bcm_board_vendor(dev) &&
             dev->dev->bus->boardinfo.type == 0x421) {
-                if (dev->dev->bus->boardinfo.rev < 0x43)
+                if (dev->dev->bus->sprom.board_rev < 0x43)
                         att = 2;
-                else if (dev->dev->bus->boardinfo.rev < 0x51)
+                else if (dev->dev->bus->sprom.board_rev < 0x51)
                         att = 3;
         }
         if (att == 0xFFFF)