b43: drop ssb-duplicated workaround for dangling cores

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>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 675e288a3c53a15f0e1f283cb73efdc37eca5809..70838e825341baedccf29ed315c895c13be1ed46 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4836,25 +4836,8 @@ static void b43_one_core_detach(struct ssb_device *dev)
 static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl)
 {
        struct b43_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))) {
-                       b43dbg(wl, "Ignoring unconnected 802.11 core\n");
-                       return -ENODEV;
-               }
-       }
-
        wldev = kzalloc(sizeof(*wldev), GFP_KERNEL);
        if (!wldev)
                goto out;