9 files changed, 54 insertions, 57 deletions

diff --git a/drivers/net/wireless/b43/bus.c b/drivers/net/wireless/b43/bus.c
index 8d0e7584eafd..f897b7054a0a 100644
--- a/drivers/net/wireless/b43/bus.c
+++ b/drivers/net/wireless/b43/bus.c
@@ -74,6 +74,10 @@ struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev)
         dev->dma_dev = sdev->dma_dev;
         dev->irq = sdev->irq;
 
+        dev->board_vendor = sdev->bus->boardinfo.vendor;
+        dev->board_type = sdev->bus->boardinfo.type;
+        dev->board_rev = sdev->bus->boardinfo.rev;
+
         dev->chip_id = sdev->bus->chip_id;
         dev->chip_rev = sdev->bus->chip_rev;
         dev->chip_pkg = sdev->bus->chip_package;
diff --git a/drivers/net/wireless/b43/bus.h b/drivers/net/wireless/b43/bus.h
index 14942fb605d9..e88b4494beaa 100644
--- a/drivers/net/wireless/b43/bus.h
+++ b/drivers/net/wireless/b43/bus.h
@@ -24,6 +24,10 @@ struct b43_bus_dev {
         struct device *dma_dev;
         unsigned int irq;
 
+        u16 board_vendor;
+        u16 board_type;
+        u16 board_rev;
+
         u16 chip_id;
         u8 chip_rev;
         u8 chip_pkg;
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
index 70bcf4276146..b56ed41fc1bd 100644
--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -215,7 +215,6 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev,
                                   enum b43_led_behaviour *behaviour,
                                   bool *activelow)
 {
-        struct ssb_bus *bus = dev->sdev->bus;
         u8 sprom[4];
 
         sprom[0] = dev->dev->bus_sprom->gpio0;
@@ -231,12 +230,12 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev,
                 case 0:
                         *behaviour = B43_LED_ACTIVITY;
                         *activelow = 1;
-                        if (bus->boardinfo.vendor == PCI_VENDOR_ID_COMPAQ)
+                        if (dev->dev->board_vendor == PCI_VENDOR_ID_COMPAQ)
                                 *behaviour = B43_LED_RADIO_ALL;
                         break;
                 case 1:
                         *behaviour = B43_LED_RADIO_B;
-                        if (bus->boardinfo.vendor == PCI_VENDOR_ID_ASUSTEK)
+                        if (dev->dev->board_vendor == PCI_VENDOR_ID_ASUSTEK)
                                 *behaviour = B43_LED_ASSOC;
                         break;
                 case 2:
diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c
index 821b516fe9e4..73ace5552bad 100644
--- a/drivers/net/wireless/b43/phy_a.c
+++ b/drivers/net/wireless/b43/phy_a.c
@@ -265,7 +265,6 @@ static void hardware_pctl_init_aphy(struct b43_wldev *dev)
 
 void b43_phy_inita(struct b43_wldev *dev)
 {
-        struct ssb_bus *bus = dev->sdev->bus;
         struct b43_phy *phy = &dev->phy;
 
         /* This lowlevel A-PHY init is also called from G-PHY init.
@@ -296,9 +295,9 @@ void b43_phy_inita(struct b43_wldev *dev)
 
                 b43_radio_init2060(dev);
 
-                if ((bus->boardinfo.vendor == SSB_BOARDVENDOR_BCM) &&
-                    ((bus->boardinfo.type == SSB_BOARD_BU4306) ||
-                     (bus->boardinfo.type == SSB_BOARD_BU4309))) {
+                if ((dev->dev->board_vendor == SSB_BOARDVENDOR_BCM) &&
+                    ((dev->dev->board_type == SSB_BOARD_BU4306) ||
+                     (dev->dev->board_type == SSB_BOARD_BU4309))) {
                         ; //TODO: A PHY LO
                 }
 
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 3f7bdf845446..425af28ea4e5 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -368,8 +368,8 @@ void b43_phy_txpower_check(struct b43_wldev *dev, unsigned int flags)
         /* The next check will be needed in two seconds, or later. */
         phy->next_txpwr_check_time = round_jiffies(now + (HZ * 2));
 
-        if ((dev->sdev->bus->boardinfo.vendor == SSB_BOARDVENDOR_BCM) &&
-            (dev->sdev->bus->boardinfo.type == SSB_BOARD_BU4306))
+        if ((dev->dev->board_vendor == SSB_BOARDVENDOR_BCM) &&
+            (dev->dev->board_type == SSB_BOARD_BU4306))
                 return; /* No software txpower adjustment needed */
 
         result = phy->ops->recalc_txpower(dev, !!(flags & B43_TXPWR_IGNORE_TSSI));
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c
index 40ce9e6d104e..684be1fd59ae 100644
--- a/drivers/net/wireless/b43/phy_g.c
+++ b/drivers/net/wireless/b43/phy_g.c
@@ -1491,7 +1491,6 @@ static u16 b43_radio_init2050(struct b43_wldev *dev)
 
 static void b43_phy_initb5(struct b43_wldev *dev)
 {
-        struct ssb_bus *bus = dev->sdev->bus;
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_g *gphy = phy->g;
         u16 offset, value;
@@ -1500,8 +1499,8 @@ static void b43_phy_initb5(struct b43_wldev *dev)
         if (phy->analog == 1) {
                 b43_radio_set(dev, 0x007A, 0x0050);
         }
-        if ((bus->boardinfo.vendor != SSB_BOARDVENDOR_BCM) &&
-            (bus->boardinfo.type != SSB_BOARD_BU4306)) {
+        if ((dev->dev->board_vendor != SSB_BOARDVENDOR_BCM) &&
+            (dev->dev->board_type != SSB_BOARD_BU4306)) {
                 value = 0x2120;
                 for (offset = 0x00A8; offset < 0x00C7; offset++) {
                         b43_phy_write(dev, offset, value);
@@ -1922,7 +1921,6 @@ static void b43_hardware_pctl_init_gphy(struct b43_wldev *dev)
 /* Initialize B/G PHY power control */
 static void b43_phy_init_pctl(struct b43_wldev *dev)
 {
-        struct ssb_bus *bus = dev->sdev->bus;
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_g *gphy = phy->g;
         struct b43_rfatt old_rfatt;
@@ -1931,8 +1929,8 @@ static void b43_phy_init_pctl(struct b43_wldev *dev)
 
         B43_WARN_ON(phy->type != B43_PHYTYPE_G);
 
-        if ((bus->boardinfo.vendor == SSB_BOARDVENDOR_BCM) &&
-            (bus->boardinfo.type == SSB_BOARD_BU4306))
+        if ((dev->dev->board_vendor == SSB_BOARDVENDOR_BCM) &&
+            (dev->dev->board_type == SSB_BOARD_BU4306))
                 return;
 
         b43_phy_write(dev, 0x0028, 0x8018);
@@ -2136,17 +2134,17 @@ static void default_baseband_attenuation(struct b43_wldev *dev,
 static void default_radio_attenuation(struct b43_wldev *dev,
                                       struct b43_rfatt *rf)
 {
-        struct ssb_bus *bus = dev->sdev->bus;
+        struct b43_bus_dev *bdev = dev->dev;
         struct b43_phy *phy = &dev->phy;
 
         rf->with_padmix = 0;
 
-        if (bus->boardinfo.vendor == SSB_BOARDVENDOR_BCM &&
-            bus->boardinfo.type == SSB_BOARD_BCM4309G) {
+        if (dev->dev->board_vendor == SSB_BOARDVENDOR_BCM &&
+            dev->dev->board_type == SSB_BOARD_BCM4309G) {