diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-05-08 14:30:33 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-10 15:54:49 -0400 |
commit | 3ed3f49473985718ce51f84d990ed5b8b6472598 (patch) | |
tree | b175ffdf32bed3ccc7c26cbee8d85956378cf645 /drivers/net/wireless/b43legacy | |
parent | 25ea0dd9ffb7459f3b2948430f75d99b46ca1870 (diff) |
b43legacy: 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>
Diffstat (limited to 'drivers/net/wireless/b43legacy')
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 2162663293c0..f6d54463b24f 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -3696,26 +3696,8 @@ static int b43legacy_one_core_attach(struct ssb_device *dev, | |||
3696 | struct b43legacy_wl *wl) | 3696 | struct b43legacy_wl *wl) |
3697 | { | 3697 | { |
3698 | struct b43legacy_wldev *wldev; | 3698 | struct b43legacy_wldev *wldev; |
3699 | struct pci_dev *pdev; | ||
3700 | int err = -ENOMEM; | 3699 | int err = -ENOMEM; |
3701 | 3700 | ||
3702 | if (!list_empty(&wl->devlist)) { | ||
3703 | /* We are not the first core on this chip. */ | ||
3704 | pdev = (dev->bus->bustype == SSB_BUSTYPE_PCI) ? dev->bus->host_pci : NULL; | ||
3705 | /* Only special chips support more than one wireless | ||
3706 | * core, although some of the other chips have more than | ||
3707 | * one wireless core as well. Check for this and | ||
3708 | * bail out early. | ||
3709 | */ | ||
3710 | if (!pdev || | ||
3711 | ((pdev->device != 0x4321) && | ||
3712 | (pdev->device != 0x4313) && | ||
3713 | (pdev->device != 0x431A))) { | ||
3714 | b43legacydbg(wl, "Ignoring unconnected 802.11 core\n"); | ||
3715 | return -ENODEV; | ||
3716 | } | ||
3717 | } | ||
3718 | |||
3719 | wldev = kzalloc(sizeof(*wldev), GFP_KERNEL); | 3701 | wldev = kzalloc(sizeof(*wldev), GFP_KERNEL); |
3720 | if (!wldev) | 3702 | if (!wldev) |
3721 | goto out; | 3703 | goto out; |