forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-07-18 18:34:51 -07:00 • committed by Greg Kroah-Hartman
parent e10355b946
commit 096de334d9
1 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
drivers/staging/comedi/drivers/adv_pci_dio.c
View file

@ -1055,43 +1055,31 @@ static struct pci_dev *pci_dio_find_pci_dev(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
struct pci_dev *pcidev = NULL; struct pci_dev *pcidev = NULL;
unsigned long iobase; int bus = it->options[0];
int slot = it->options[1];
int i; int i;
for_each_pci_dev(pcidev) { 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) { for (i = 0; i < ARRAY_SIZE(boardtypes); ++i) {
if (boardtypes[i].vendor_id != pcidev->vendor) if (boardtypes[i].vendor_id != pcidev->vendor)
continue; continue;
if (boardtypes[i].device_id != pcidev->device) if (boardtypes[i].device_id != pcidev->device)
continue; 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; dev->board_ptr = boardtypes + i;
break; return pcidev;
} }
if (dev->board_ptr)
break;
} }
dev_err(dev->class_dev,
if (!dev->board_ptr) { "No supported board found! (req. bus %d, slot %d)\n",
dev_err(dev->class_dev, bus, slot);
"Error: Requested type of the card was not found!\n"); return NULL;
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, static int pci_dio_attach(struct comedi_device *dev,