Use for_each_pci_dev() instead of open-coding the loop using
pci_get_device().
Drop the printk error messages. They just add noise.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/adv_pci1723.c | 63 ++++++++--------------------
1 file changed, 17 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c
b/drivers/staging/comedi/drivers/adv_pci1723.c
index 4803a8c..f561a2a 100644
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -290,59 +290,30 @@ static int pci1723_dio_insn_bits(struct comedi_device
*dev,
static struct pci_dev *pci1723_find_pci_dev(struct comedi_device *dev,
struct comedi_devconfig *it)
{
- struct pci_dev *pcidev;
- unsigned int iobase;
- unsigned char pci_bus, pci_slot, pci_func;
- int opt_bus, opt_slot;
- const char *errstr;
-
- opt_bus = it->options[0];
- opt_slot = it->options[1];
-
- /* Look for matching PCI device */
- errstr = "not found!";
- pcidev = NULL;
- while (NULL != (pcidev =
- pci_get_device(PCI_VENDOR_ID_ADVANTECH,
- this_board->device_id, pcidev))) {
- /* Found matching vendor/device. */
- if (opt_bus || opt_slot) {
- /* Check bus/slot. */
- if (opt_bus != pcidev->bus->number
- || opt_slot != PCI_SLOT(pcidev->devfn))
- continue; /* no match */
+ struct pci_dev *pcidev = NULL;
+ int bus = it->options[0];
+ int slot = it->options[1];
+
+ for_each_pci_dev(pcidev) {
+ if (bus || slot) {
+ if (bus != pcidev->bus->number ||
+ slot != PCI_SLOT(pcidev->devfn))
+ continue;
}
+ if (pcidev->vendor != PCI_VENDOR_ID_ADVANTECH)
+ continue;
/*
* Look for device that isn't in use.
* Enable PCI device and request regions.
*/
- if (comedi_pci_enable(pcidev, "adv_pci1723")) {
- errstr =
- "failed to enable PCI device and request regions!";
+ if (comedi_pci_enable(pcidev, "adv_pci1723"))
continue;
- }
- break;
- }
-
- if (!pcidev) {
- if (opt_bus || opt_slot) {
- printk(KERN_ERR " - Card at b:s %d:%d %s\n",
- opt_bus, opt_slot, errstr);
- } else {
- printk(KERN_ERR " - Card %s\n", errstr);
- }
- return NULL;
+ return pcidev;
}
-
- pci_bus = pcidev->bus->number;
- pci_slot = PCI_SLOT(pcidev->devfn);
- pci_func = PCI_FUNC(pcidev->devfn);
- iobase = pci_resource_start(pcidev, 2);
-
- printk(KERN_ERR ", b:s:f=%d:%d:%d, io=0x%4x",
- pci_bus, pci_slot, pci_func, iobase);
-
- return pcidev;
+ dev_err(dev->class_dev,
+ "No supported board found! (req. bus %d, slot %d)\n",
+ bus, slot);
+ return NULL;
}
static int pci1723_attach(struct comedi_device *dev,
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
