diff options
Diffstat (limited to 'drivers/net/wireless/b43/phy_a.c')
-rw-r--r-- | drivers/net/wireless/b43/phy_a.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c index b01c8ced57c3..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) | |||
265 | 265 | ||
266 | void b43_phy_inita(struct b43_wldev *dev) | 266 | void b43_phy_inita(struct b43_wldev *dev) |
267 | { | 267 | { |
268 | struct ssb_bus *bus = dev->sdev->bus; | ||
269 | struct b43_phy *phy = &dev->phy; | 268 | struct b43_phy *phy = &dev->phy; |
270 | 269 | ||
271 | /* This lowlevel A-PHY init is also called from G-PHY init. | 270 | /* This lowlevel A-PHY init is also called from G-PHY init. |
@@ -296,9 +295,9 @@ void b43_phy_inita(struct b43_wldev *dev) | |||
296 | 295 | ||
297 | b43_radio_init2060(dev); | 296 | b43_radio_init2060(dev); |
298 | 297 | ||
299 | if ((bus->boardinfo.vendor == SSB_BOARDVENDOR_BCM) && | 298 | if ((dev->dev->board_vendor == SSB_BOARDVENDOR_BCM) && |
300 | ((bus->boardinfo.type == SSB_BOARD_BU4306) || | 299 | ((dev->dev->board_type == SSB_BOARD_BU4306) || |
301 | (bus->boardinfo.type == SSB_BOARD_BU4309))) { | 300 | (dev->dev->board_type == SSB_BOARD_BU4309))) { |
302 | ; //TODO: A PHY LO | 301 | ; //TODO: A PHY LO |
303 | } | 302 | } |
304 | 303 | ||
@@ -311,7 +310,7 @@ void b43_phy_inita(struct b43_wldev *dev) | |||
311 | } | 310 | } |
312 | 311 | ||
313 | if ((phy->type == B43_PHYTYPE_G) && | 312 | if ((phy->type == B43_PHYTYPE_G) && |
314 | (dev->sdev->bus->sprom.boardflags_lo & B43_BFL_PACTRL)) { | 313 | (dev->dev->bus_sprom->boardflags_lo & B43_BFL_PACTRL)) { |
315 | b43_phy_maskset(dev, B43_PHY_OFDM(0x6E), 0xE000, 0x3CF); | 314 | b43_phy_maskset(dev, B43_PHY_OFDM(0x6E), 0xE000, 0x3CF); |
316 | } | 315 | } |
317 | } | 316 | } |
@@ -323,17 +322,17 @@ static int b43_aphy_init_tssi2dbm_table(struct b43_wldev *dev) | |||
323 | struct b43_phy_a *aphy = phy->a; | 322 | struct b43_phy_a *aphy = phy->a; |
324 | s16 pab0, pab1, pab2; | 323 | s16 pab0, pab1, pab2; |
325 | 324 | ||
326 | pab0 = (s16) (dev->sdev->bus->sprom.pa1b0); | 325 | pab0 = (s16) (dev->dev->bus_sprom->pa1b0); |
327 | pab1 = (s16) (dev->sdev->bus->sprom.pa1b1); | 326 | pab1 = (s16) (dev->dev->bus_sprom->pa1b1); |
328 | pab2 = (s16) (dev->sdev->bus->sprom.pa1b2); | 327 | pab2 = (s16) (dev->dev->bus_sprom->pa1b2); |
329 | 328 | ||
330 | if (pab0 != 0 && pab1 != 0 && pab2 != 0 && | 329 | if (pab0 != 0 && pab1 != 0 && pab2 != 0 && |
331 | pab0 != -1 && pab1 != -1 && pab2 != -1) { | 330 | pab0 != -1 && pab1 != -1 && pab2 != -1) { |
332 | /* The pabX values are set in SPROM. Use them. */ | 331 | /* The pabX values are set in SPROM. Use them. */ |
333 | if ((s8) dev->sdev->bus->sprom.itssi_a != 0 && | 332 | if ((s8) dev->dev->bus_sprom->itssi_a != 0 && |
334 | (s8) dev->sdev->bus->sprom.itssi_a != -1) | 333 | (s8) dev->dev->bus_sprom->itssi_a != -1) |
335 | aphy->tgt_idle_tssi = | 334 | aphy->tgt_idle_tssi = |
336 | (s8) (dev->sdev->bus->sprom.itssi_a); | 335 | (s8) (dev->dev->bus_sprom->itssi_a); |
337 | else | 336 | else |
338 | aphy->tgt_idle_tssi = 62; | 337 | aphy->tgt_idle_tssi = 62; |
339 | aphy->tssi2dbm = b43_generate_dyn_tssi2dbm_tab(dev, pab0, | 338 | aphy->tssi2dbm = b43_generate_dyn_tssi2dbm_tab(dev, pab0, |