3 files changed, 1 insertions, 16 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index d7ea671394a8..68bbe8eafd6d 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3884,16 +3884,6 @@ static void b43_sprom_fixup(struct ssb_bus *bus)
         if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE &&
             bus->boardinfo.type == 0x4E && bus->boardinfo.rev > 0x40)
                 bus->sprom.boardflags_lo |= B43_BFL_PACTRL;
-
-        /* Handle case when gain is not set in sprom */
-        if (bus->sprom.antenna_gain_a == 0xFF)
-                bus->sprom.antenna_gain_a = 2;
-        if (bus->sprom.antenna_gain_bg == 0xFF)
-                bus->sprom.antenna_gain_bg = 2;
-
-        /* Convert Antennagain values to Q5.2 */
-        bus->sprom.antenna_gain_a <<= 2;
-        bus->sprom.antenna_gain_bg <<= 2;
 }
 
 static void b43_wireless_exit(struct ssb_device *dev, struct b43_wl *wl)
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 14087fc20f3a..575fd9a5874d 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3572,11 +3572,6 @@ static void b43legacy_sprom_fixup(struct ssb_bus *bus)
             bus->boardinfo.type == 0x4E &&
             bus->boardinfo.rev > 0x40)
                 bus->sprom.boardflags_lo |= B43legacy_BFL_PACTRL;
-
-        /* Convert Antennagain values to Q5.2 */
-        if (bus->sprom.antenna_gain_bg == 0xFF)
-                bus->sprom.antenna_gain_bg = 2; /* if unset, use 2 dBm */
-        bus->sprom.antenna_gain_bg <<= 2;
 }
 
 static void b43legacy_wireless_exit(struct ssb_device *dev,
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index 9d527e6d6ced..57c668f575fc 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -1859,7 +1859,7 @@ void b43legacy_phy_xmitpower(struct b43legacy_wldev *dev)
          * which accounts for the factor of 4 */
 #define REG_MAX_PWR 20
         max_pwr = min(REG_MAX_PWR * 4
-                      - dev->dev->bus->sprom.antenna_gain_bg
+                      - dev->dev->bus->sprom.antenna_gain.ghz24.a0
                       - 0x6, max_pwr);
 
         /* find the desired power in Q5.2 - power_level is in dBm