diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-05-08 14:30:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-10 15:54:49 -0400 |
commit | 25ea0dd9ffb7459f3b2948430f75d99b46ca1870 (patch) | |
tree | e6378c1a21e502b9e2551be8845d04ef24e13d80 /drivers/net/wireless | |
parent | 9a24af1136e6d08c73010205caa282f46223aed5 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 675e288a3c5..70838e82534 100644 --- 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) | |||
4836 | static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl) | 4836 | static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl) |
4837 | { | 4837 | { |
4838 | struct b43_wldev *wldev; | 4838 | struct b43_wldev *wldev; |
4839 | struct pci_dev *pdev; | ||
4840 | int err = -ENOMEM; | 4839 | int err = -ENOMEM; |
4841 | 4840 | ||
4842 | if (!list_empty(&wl->devlist)) { | ||
4843 | /* We are not the first core on this chip. */ | ||
4844 | pdev = (dev->bus->bustype == SSB_BUSTYPE_PCI) ? dev->bus->host_pci : NULL; | ||
4845 | /* Only special chips support more than one wireless | ||
4846 | * core, although some of the other chips have more than | ||
4847 | * one wireless core as well. Check for this and | ||
4848 | * bail out early. | ||
4849 | */ | ||
4850 | if (!pdev || | ||
4851 | ((pdev->device != 0x4321) && | ||
4852 | (pdev->device != 0x4313) && (pdev->device != 0x431A))) { | ||
4853 | b43dbg(wl, "Ignoring unconnected 802.11 core\n"); | ||
4854 | return -ENODEV; | ||
4855 | } | ||
4856 | } | ||
4857 | |||
4858 | wldev = kzalloc(sizeof(*wldev), GFP_KERNEL); | 4841 | wldev = kzalloc(sizeof(*wldev), GFP_KERNEL); |
4859 | if (!wldev) | 4842 | if (!wldev) |
4860 | goto out; | 4843 | goto out; |