1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c
index f47a32da534d..4c82d582a524 100644
--- a/drivers/net/wireless/b43/lo.c
+++ b/drivers/net/wireless/b43/lo.c
@@ -98,7 +98,7 @@ static u16 lo_measure_feedthrough(struct b43_wldev *dev,
                 rfover |= pga;
                 rfover |= lna;
                 rfover |= trsw_rx;
-                if ((dev->sdev->bus->sprom.boardflags_lo & B43_BFL_EXTLNA)
+                if ((dev->dev->bus_sprom->boardflags_lo & B43_BFL_EXTLNA)
                     && phy->rev > 6)
                         rfover |= B43_PHY_RFOVERVAL_EXTLNA;
 
@@ -301,14 +301,12 @@ static void lo_measure_gain_values(struct b43_wldev *dev,
                 max_rx_gain = 0;
 
         if (has_loopback_gain(phy)) {
-                int trsw_rx = 0;
                 int trsw_rx_gain;
 
                 if (use_trsw_rx) {
                         trsw_rx_gain = gphy->trsw_rx_gain / 2;
                         if (max_rx_gain >= trsw_rx_gain) {
                                 trsw_rx_gain = max_rx_gain - trsw_rx_gain;
-                                trsw_rx = 0x20;
                         }
                 } else
                         trsw_rx_gain = max_rx_gain;
@@ -387,7 +385,7 @@ struct lo_g_saved_values {
 static void lo_measure_setup(struct b43_wldev *dev,
                              struct lo_g_saved_values *sav)
 {
-        struct ssb_sprom *sprom = &dev->sdev->bus->sprom;
+        struct ssb_sprom *sprom = dev->dev->bus_sprom;
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_g *gphy = phy->g;
         struct b43_txpower_lo_control *lo = gphy->lo_control;