b43: drop invalid IMCFGLO workaround
authorRafał Miłecki <zajec5@gmail.com>
Thu, 5 May 2011 10:45:52 +0000 (12:45 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 May 2011 18:59:23 +0000 (14:59 -0400)
We were performing it on wrong core, it was outdated and is already
implemented in ssb.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/main.c

index 57eb5b6..675e288 100644 (file)
@@ -4212,33 +4212,7 @@ static void b43_bluetooth_coext_disable(struct b43_wldev *dev)
 
 static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
 {
-#ifdef CONFIG_SSB_DRIVER_PCICORE
-       struct ssb_bus *bus = dev->dev->bus;
-       u32 tmp;
-
-       if (bus->pcicore.dev &&
-           bus->pcicore.dev->id.coreid == SSB_DEV_PCI &&
-           bus->pcicore.dev->id.revision <= 5) {
-               /* IMCFGLO timeouts workaround. */
-               tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
-               switch (bus->bustype) {
-               case SSB_BUSTYPE_PCI:
-               case SSB_BUSTYPE_PCMCIA:
-                       tmp &= ~SSB_IMCFGLO_REQTO;
-                       tmp &= ~SSB_IMCFGLO_SERTO;
-                       tmp |= 0x32;
-                       break;
-               case SSB_BUSTYPE_SSB:
-                       tmp &= ~SSB_IMCFGLO_REQTO;
-                       tmp &= ~SSB_IMCFGLO_SERTO;
-                       tmp |= 0x53;
-                       break;
-               default:
-                       break;
-               }
-               ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
-       }
-#endif /* CONFIG_SSB_DRIVER_PCICORE */
+       /* TODO: implement 80211 core workaround here */
 }
 
 static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)