]> git.karo-electronics.de Git - linux-beck.git/commitdiff
b43legacy: drop ssb-duplicated workaround for dangling cores
authorRafał Miłecki <zajec5@gmail.com>
Sun, 8 May 2011 18:30:33 +0000 (20:30 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 May 2011 19:54:49 +0000 (15:54 -0400)
Remove the code to detect inactive 802.11 cores, as that function is now done
in ssb.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43legacy/main.c

index 2162663293c00a71e95e0f79f36ee3e5ab9a2a84..f6d54463b24f2d0e933b8f0ec41818c8622a687a 100644 (file)
@@ -3696,26 +3696,8 @@ static int b43legacy_one_core_attach(struct ssb_device *dev,
                                     struct b43legacy_wl *wl)
 {
        struct b43legacy_wldev *wldev;
-       struct pci_dev *pdev;
        int err = -ENOMEM;
 
-       if (!list_empty(&wl->devlist)) {
-               /* We are not the first core on this chip. */
-               pdev = (dev->bus->bustype == SSB_BUSTYPE_PCI) ? dev->bus->host_pci : NULL;
-               /* Only special chips support more than one wireless
-                * core, although some of the other chips have more than
-                * one wireless core as well. Check for this and
-                * bail out early.
-                */
-               if (!pdev ||
-                   ((pdev->device != 0x4321) &&
-                    (pdev->device != 0x4313) &&
-                    (pdev->device != 0x431A))) {
-                       b43legacydbg(wl, "Ignoring unconnected 802.11 core\n");
-                       return -ENODEV;
-               }
-       }
-
        wldev = kzalloc(sizeof(*wldev), GFP_KERNEL);
        if (!wldev)
                goto out;