Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8258d392 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove pci_is_enabled() tests 



As mentioned by Ian Abbott, the comedi pci drivers that try to
locate an unused pci device with the pci_is_enabled() test
might actually skip over a perfectly good unused device. This
test is also not consistent with the other comedi pci drivers.

Remove the test from all the comedi pci drivers.

Reported-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d7614f0

drivers/staging/comedi/drivers/adv_pci1710.c

+0 −3
Original line number Diff line number Diff line
@@ -1349,9 +1349,6 @@ static struct pci_dev *pci1710_find_pci_dev(struct comedi_device *dev, 
		}

		if (pcidev->vendor != PCI_VENDOR_ID_ADVANTECH)

			continue;

		if (pci_is_enabled(pcidev))

			continue;



		if (strcmp(this_board->name, DRV_NAME) == 0) {

			for (i = 0; i < ARRAY_SIZE(boardtypes); ++i) {

				if (pcidev->device == boardtypes[i].device_id) {

drivers/staging/comedi/drivers/adv_pci1723.c

+0 −2
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ static struct pci_dev *pci1723_find_pci_dev(struct comedi_device *dev, 
		}

		if (pcidev->vendor != PCI_VENDOR_ID_ADVANTECH)

			continue;

		if (pci_is_enabled(pcidev))

			continue;

		return pcidev;

	}

	dev_err(dev->class_dev,

drivers/staging/comedi/drivers/adv_pci_dio.c

+0 −2
Original line number Diff line number Diff line
@@ -1064,8 +1064,6 @@ static struct pci_dev *pci_dio_find_pci_dev(struct comedi_device *dev, 
			    slot != PCI_SLOT(pcidev->devfn))

				continue;

		}

		if (pci_is_enabled(pcidev))

			continue;

		for (i = 0; i < ARRAY_SIZE(boardtypes); ++i) {

			if (boardtypes[i].vendor_id != pcidev->vendor)

				continue;