b43legacy: Convert to use of the new SPROM structure

The b43legacy driver is modified to use the new SPROM structure.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 41 insertions, 39 deletions

diff --git a/drivers/net/wireless/b43legacy/leds.c b/drivers/net/wireless/b43legacy/leds.c
index b4319c99cf70..f0affb781002 100644
--- a/drivers/net/wireless/b43legacy/leds.c
+++ b/drivers/net/wireless/b43legacy/leds.c
@@ -189,10 +189,10 @@ void b43legacy_leds_init(struct b43legacy_wldev *dev)
         enum b43legacy_led_behaviour behaviour;
         bool activelow;
 
-        sprom[0] = bus->sprom.r1.gpio0;
-        sprom[1] = bus->sprom.r1.gpio1;
-        sprom[2] = bus->sprom.r1.gpio2;
-        sprom[3] = bus->sprom.r1.gpio3;
+        sprom[0] = bus->sprom.gpio0;
+        sprom[1] = bus->sprom.gpio1;
+        sprom[2] = bus->sprom.gpio2;
+        sprom[3] = bus->sprom.gpio3;
 
         for (i = 0; i < 4; i++) {
                 if (sprom[i] == 0xFF) {
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index e545f79ac747..1a8b67619077 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1745,7 +1745,7 @@ static int b43legacy_gpio_init(struct b43legacy_wldev *dev)
                 mask |= 0x0060;
                 set |= 0x0060;
         }
-        if (dev->dev->bus->sprom.r1.boardflags_lo & B43legacy_BFL_PACTRL) {
+        if (dev->dev->bus->sprom.boardflags_lo & B43legacy_BFL_PACTRL) {
                 b43legacy_write16(dev, B43legacy_MMIO_GPIO_MASK,
                                   b43legacy_read16(dev,
                                   B43legacy_MMIO_GPIO_MASK)
@@ -2122,7 +2122,7 @@ static void b43legacy_periodic_every120sec(struct b43legacy_wldev *dev)
 static void b43legacy_periodic_every60sec(struct b43legacy_wldev *dev)
 {
         b43legacy_phy_lo_mark_all_unused(dev);
-        if (dev->dev->bus->sprom.r1.boardflags_lo & B43legacy_BFL_RSSI) {
+        if (dev->dev->bus->sprom.boardflags_lo & B43legacy_BFL_RSSI) {
                 b43legacy_mac_suspend(dev);
                 b43legacy_calc_nrssi_slope(dev);
                 b43legacy_mac_enable(dev);
@@ -3064,7 +3064,7 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev)
                 hf |= B43legacy_HF_SYMW;
                 if (phy->rev == 1)
                         hf |= B43legacy_HF_GDCW;
-                if (sprom->r1.boardflags_lo & B43legacy_BFL_PACTRL)
+                if (sprom->boardflags_lo & B43legacy_BFL_PACTRL)
                         hf |= B43legacy_HF_OFDMPABOOST;
         } else if (phy->type == B43legacy_PHYTYPE_B) {
                 hf |= B43legacy_HF_SYMW;
@@ -3556,12 +3556,12 @@ static void b43legacy_sprom_fixup(struct ssb_bus *bus)
         if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE &&
             bus->boardinfo.type == 0x4E &&
             bus->boardinfo.rev > 0x40)
-                bus->sprom.r1.boardflags_lo |= B43legacy_BFL_PACTRL;
+                bus->sprom.boardflags_lo |= B43legacy_BFL_PACTRL;
 
         /* Convert Antennagain values to Q5.2 */
-        if (bus->sprom.r1.antenna_gain_bg == 0xFF)
-                bus->sprom.r1.antenna_gain_bg = 2; /* if unset, use 2 dBm */
-        bus->sprom.r1.antenna_gain_bg <<= 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,
@@ -3596,10 +3596,10 @@ static int b43legacy_wireless_init(struct ssb_device *dev)
         hw->max_noise = -110;
         hw->queues = 1; /* FIXME: hardware has more queues */
         SET_IEEE80211_DEV(hw, dev->dev);
-        if (is_valid_ether_addr(sprom->r1.et1mac))
-                SET_IEEE80211_PERM_ADDR(hw, sprom->r1.et1mac);
+        if (is_valid_ether_addr(sprom->et1mac))
+                SET_IEEE80211_PERM_ADDR(hw, sprom->et1mac);
         else
-                SET_IEEE80211_PERM_ADDR(hw, sprom->r1.il0mac);
+                SET_IEEE80211_PERM_ADDR(hw, sprom->il0mac);
 
         /* Get and initialize struct b43legacy_wl */
         wl = hw_to_b43legacy_wl(hw);
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c
index d121fae53aa0..9d527e6d6ced 100644
--- a/drivers/net/wireless/b43legacy/phy.c
+++ b/drivers/net/wireless/b43legacy/phy.c
@@ -441,7 +441,7 @@ static void b43legacy_phy_inita(struct b43legacy_wldev *dev)
         might_sleep();
 
         b43legacy_phy_setupg(dev);
-        if (dev->dev->bus->sprom.r1.boardflags_lo & B43legacy_BFL_PACTRL)
+        if (dev->dev->bus->sprom.boardflags_lo & B43legacy_BFL_PACTRL)
                 b43legacy_phy_write(dev, 0x046E, 0x03CF);
 }
 
@@ -543,7 +543,7 @@ static void b43legacy_phy_initb4(struct b43legacy_wldev *dev)
         if (phy->radio_ver == 0x2050)
                 b43legacy_phy_write(dev, 0x002A, 0x88C2);
         b43legacy_radio_set_txpower_bg(dev, 0xFFFF, 0xFFFF, 0xFFFF);
-        if (dev->dev->bus->sprom.r1.boardflags_lo & B43legacy_BFL_RSSI) {
+        if (dev->dev->bus->sprom.boardflags_lo & B43legacy_BFL_RSSI) {
                 b43legacy_calc_nrssi_slope(dev);
                 b43legacy_calc_nrssi_threshold(dev);
         }
@@ -699,7 +699,7 @@ static void b43legacy_phy_initb6(struct b43legacy_wldev *dev)
                 b43legacy_radio_write16(dev, 0x005A, 0x0088);
                 b43legacy_radio_write16(dev, 0x005B, 0x006B);
                 b43legacy_radio_write16(dev, 0x005C, 0x000F);
-                if (dev->dev->bus->sprom.r1.boardflags_lo & 0x8000) {
+                if (dev->dev->bus->sprom.boardflags_lo & 0x8000) {
                         b43legacy_radio_write16(dev, 0x005D, 0x00FA);
                         b43legacy_radio_write16(dev, 0x005E, 0x00D8);
                 } else {
@@ -797,7 +797,7 @@ static void b43legacy_phy_initb6(struct b43legacy_wldev *dev)
                 b43legacy_phy_write(dev, 0x0062, 0x0007);
                 b43legacy_radio_init2050(dev);
                 b43legacy_phy_lo_g_measure(dev);
-                if (dev->dev->bus->sprom.r1.boardflags_lo &
+                if (dev->dev->bus->sprom.boardflags_lo &
                     B43legacy_BFL_RSSI) {
                         b43legacy_calc_nrssi_slope(dev);
                         b43legacy_calc_nrssi_threshold(dev);
@@ -921,7 +921,7 @@ static void b43legacy_calc_loopback_gain(struct b43legacy_wldev *dev)
                             b43legacy_phy_read(dev, 0x0811) | 0x0100);
         b43legacy_phy_write(dev, 0x0812,
                             b43legacy_phy_read(dev, 0x0812) & 0xCFFF);
-        if (dev->dev->bus->sprom.r1.boardflags_lo & B43legacy_BFL_EXTLNA) {
+        if (dev->dev->bus->sprom.boardflags_lo & B43legacy_BFL_EXTLNA) {
                 if (phy->rev >= 7) {
                         b43legacy_phy_write(dev, 0x0811,
                                             b43legacy_phy_read(dev, 0x0811)
@@ -1072,7 +1072,7 @@ static void b43legacy_phy_initg(struct b43legacy_wldev *dev)
                         b43legacy_phy_write(dev, 0x0036,
                                             (b43legacy_phy_read(dev, 0x0036)
                                              & 0x0FFF) | (phy->txctl2 << 12));
-                if (dev->dev->bus->sprom.r1.boardflags_lo &
+                if (dev->dev->bus->sprom.boardflags_lo &
                     B43legacy_BFL_PACTRL)
                         b43legacy_phy_write(dev, 0x002E, 0x8075);
                 else
@@ -1087,7 +1087,7 @@ static void b43legacy_phy_initg(struct b43legacy_wldev *dev)
                 b43legacy_phy_write(dev, 0x080F, 0x8078);
         }
 
-        if (!(dev->dev->bus->sprom.r1.boardflags_lo & B43legacy_BFL_RSSI)) {
+        if (!(dev->dev->bus->sprom.boardflags_lo & B43legacy_BFL_RSSI)) {