1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 971ec1b56b06..0f3a104a0ac8 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1427,9 +1427,9 @@ u8 b43_ieee80211_antenna_sanitize(struct b43_wldev *dev,
 
         /* Get the mask of available antennas. */
         if (dev->phy.gmode)
-                antenna_mask = dev->sdev->bus->sprom.ant_available_bg;
+                antenna_mask = dev->dev->bus_sprom->ant_available_bg;
         else
-                antenna_mask = dev->sdev->bus->sprom.ant_available_a;
+                antenna_mask = dev->dev->bus_sprom->ant_available_a;
 
         if (!(antenna_mask & (1 << (antenna_nr - 1)))) {
                 /* This antenna is not available. Fall back to default. */
@@ -2599,7 +2599,7 @@ static int b43_gpio_init(struct b43_wldev *dev)
                 mask |= 0x0180;
                 set |= 0x0180;
         }
-        if (dev->sdev->bus->sprom.boardflags_lo & B43_BFL_PACTRL) {
+        if (dev->dev->bus_sprom->boardflags_lo & B43_BFL_PACTRL) {
                 b43_write16(dev, B43_MMIO_GPIO_MASK,
                             b43_read16(dev, B43_MMIO_GPIO_MASK)
                             | 0x0200);
@@ -4204,7 +4204,7 @@ static void setup_struct_wldev_for_init(struct b43_wldev *dev)
 
 static void b43_bluetooth_coext_enable(struct b43_wldev *dev)
 {
-        struct ssb_sprom *sprom = &dev->sdev->bus->sprom;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
         u64 hf;
 
         if (!modparam_btcoex)
@@ -4318,7 +4318,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
 static int b43_wireless_core_init(struct b43_wldev *dev)
 {
         struct ssb_bus *bus = dev->sdev->bus;
-        struct ssb_sprom *sprom = &bus->sprom;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
         struct b43_phy *phy = &dev->phy;
         int err;
         u64 hf;