b43legacy: drop invalid IMCFGLO workaround

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>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index c7fd73e3ad76a1fae828aaef60cf1fcfeffcf8b1..2162663293c00a71e95e0f79f36ee3e5ab9a2a84 100644 (file)
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3104,37 +3104,6 @@ static void setup_struct_wldev_for_init(struct b43legacy_wldev *dev)
        memset(&dev->noisecalc, 0, sizeof(dev->noisecalc));
 }
 
-static void b43legacy_imcfglo_timeouts_workaround(struct b43legacy_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 */
-}
-
 static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev,
                                          bool idle) {
        u16 pu_delay = 1050;
@@ -3278,7 +3247,6 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev)
        /* Enable IRQ routing to this device. */
        ssb_pcicore_dev_irqvecs_enable(&bus->pcicore, dev->dev);
 
-       b43legacy_imcfglo_timeouts_workaround(dev);
        prepare_phy_data_for_init(dev);
        b43legacy_phy_calibrate(dev);
        err = b43legacy_chip_init(dev);