mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-27 16:15:54 +08:00
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>
This commit is contained in:
parent
25ea0dd9ff
commit
3ed3f49473
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user