Messages in this thread Patch in this message | | | From | H Hartley Sweeten <> | Subject | [PATCH 23/90] staging: comedi: adv_pci_dio: cleanup "find pci device" code | Date | Wed, 18 Jul 2012 18:34:51 -0700 |
| |
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> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/staging/comedi/drivers/adv_pci_dio.c | 40 ++++++++++------------------ 1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index ab92169..c805208 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c @@ -1055,43 +1055,31 @@ 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"); - 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; + dev_err(dev->class_dev, + "No supported board found! (req. bus %d, slot %d)\n", + bus, slot); + return NULL; } static int pci_dio_attach(struct comedi_device *dev, -- 1.7.11
| |