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

staging: comedi: adv_pci_dio: cleanup "find pci device" code 



Add a couple local variables to make the tests more concise.
Reorder the tests to make the for() loop checking for a
matching boardtype quicker.

Drop the dev_dbg message for a match. It's just add noise.

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

drivers/staging/comedi/drivers/adv_pci_dio.c

+14 −26
Original line number Diff line number Diff line
@@ -1055,44 +1055,32 @@ static struct pci_dev *pci_dio_find_pci_dev(struct comedi_device *dev, 
					    struct comedi_devconfig *it)

{

	struct pci_dev *pcidev = NULL;

	unsigned long iobase;

	int bus = it->options[0];

	int slot = it->options[1];

	int i;



	for_each_pci_dev(pcidev) {

		/*  loop through cards supported by this driver */

		if (bus || slot) {

			if (bus != pcidev->bus->number ||

			    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;

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

				continue;

			/*  was a particular bus/slot requested? */

			if (it->options[0] || it->options[1]) {

				/*  are we on the wrong bus/slot? */

				if (pcidev->bus->number != it->options[0] ||

				    PCI_SLOT(pcidev->devfn) != it->options[1]) {

					continue;

				}

			}

			if (pci_is_enabled(pcidev))

				continue;

			dev->board_ptr = boardtypes + i;

			break;

			return pcidev;

		}

		if (dev->board_ptr)

			break;

	}



	if (!dev->board_ptr) {

	dev_err(dev->class_dev,

			"Error: Requested type of the card was not found!\n");

		"No supported board found! (req. bus %d, slot %d)\n",

		bus, slot);

	return NULL;

}

	iobase = pci_resource_start(devpriv->pcidev, this_board->main_pci_region);

	dev_dbg(dev->class_dev, "b:s:f=%d:%d:%d, io=0x%4lx\n",

		pcidev->bus->number, PCI_SLOT(pcidev->devfn),

		PCI_FUNC(pcidev->devfn), iobase);

	return pcidev;

}



static int pci_dio_attach(struct comedi_device *dev,

			  struct comedi_devconfig *it)