mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 04:32:03 +00:00
b43: use new pointers path to access ssb_device in SSB specific places
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
02a0fbe4dc
commit
d48ae5c826
@ -1146,6 +1146,7 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
|
||||
|
||||
static void b43_ssb_wireless_core_reset(struct b43_wldev *dev, u32 flags)
|
||||
{
|
||||
struct ssb_device *sdev = dev->dev->sdev;
|
||||
u32 tmslow;
|
||||
|
||||
flags |= B43_TMSLOW_PHYCLKEN;
|
||||
@ -1156,15 +1157,15 @@ static void b43_ssb_wireless_core_reset(struct b43_wldev *dev, u32 flags)
|
||||
msleep(2); /* Wait for the PLL to turn on. */
|
||||
|
||||
/* Now take the PHY out of Reset again */
|
||||
tmslow = ssb_read32(dev->sdev, SSB_TMSLOW);
|
||||
tmslow = ssb_read32(sdev, SSB_TMSLOW);
|
||||
tmslow |= SSB_TMSLOW_FGC;
|
||||
tmslow &= ~B43_TMSLOW_PHYRESET;
|
||||
ssb_write32(dev->sdev, SSB_TMSLOW, tmslow);
|
||||
ssb_read32(dev->sdev, SSB_TMSLOW); /* flush */
|
||||
ssb_write32(sdev, SSB_TMSLOW, tmslow);
|
||||
ssb_read32(sdev, SSB_TMSLOW); /* flush */
|
||||
msleep(1);
|
||||
tmslow &= ~SSB_TMSLOW_FGC;
|
||||
ssb_write32(dev->sdev, SSB_TMSLOW, tmslow);
|
||||
ssb_read32(dev->sdev, SSB_TMSLOW); /* flush */
|
||||
ssb_write32(sdev, SSB_TMSLOW, tmslow);
|
||||
ssb_read32(sdev, SSB_TMSLOW); /* flush */
|
||||
msleep(1);
|
||||
}
|
||||
|
||||
@ -2157,7 +2158,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
|
||||
switch (dev->phy.type) {
|
||||
case B43_PHYTYPE_A:
|
||||
if ((rev >= 5) && (rev <= 10)) {
|
||||
tmshigh = ssb_read32(dev->sdev, SSB_TMSHIGH);
|
||||
tmshigh = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);
|
||||
if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY)
|
||||
filename = "a0g1initvals5";
|
||||
else
|
||||
@ -2202,7 +2203,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
|
||||
switch (dev->phy.type) {
|
||||
case B43_PHYTYPE_A:
|
||||
if ((rev >= 5) && (rev <= 10)) {
|
||||
tmshigh = ssb_read32(dev->sdev, SSB_TMSHIGH);
|
||||
tmshigh = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);
|
||||
if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY)
|
||||
filename = "a0g1bsinitvals5";
|
||||
else
|
||||
@ -2566,7 +2567,7 @@ out:
|
||||
*/
|
||||
static struct ssb_device *b43_ssb_gpio_dev(struct b43_wldev *dev)
|
||||
{
|
||||
struct ssb_bus *bus = dev->sdev->bus;
|
||||
struct ssb_bus *bus = dev->dev->sdev->bus;
|
||||
|
||||
#ifdef CONFIG_SSB_DRIVER_PCICORE
|
||||
return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
|
||||
@ -4231,16 +4232,21 @@ static void b43_bluetooth_coext_disable(struct b43_wldev *dev)
|
||||
|
||||
static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
|
||||
{
|
||||
struct ssb_bus *bus = dev->sdev->bus;
|
||||
struct ssb_bus *bus;
|
||||
u32 tmp;
|
||||
|
||||
if (dev->dev->bus_type != B43_BUS_SSB)
|
||||
return;
|
||||
|
||||
bus = dev->dev->sdev->bus;
|
||||
|
||||
if ((bus->chip_id == 0x4311 && bus->chip_rev == 2) ||
|
||||
(bus->chip_id == 0x4312)) {
|
||||
tmp = ssb_read32(dev->sdev, SSB_IMCFGLO);
|
||||
tmp = ssb_read32(dev->dev->sdev, SSB_IMCFGLO);
|
||||
tmp &= ~SSB_IMCFGLO_REQTO;
|
||||
tmp &= ~SSB_IMCFGLO_SERTO;
|
||||
tmp |= 0x3;
|
||||
ssb_write32(dev->sdev, SSB_IMCFGLO, tmp);
|
||||
ssb_write32(dev->dev->sdev, SSB_IMCFGLO, tmp);
|
||||
ssb_commit_settings(bus);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user