staging: comedi: rtd520: cleanup the "find pci device" code

Use for_each_pci_dev() instead of open-coding the for loop. Create
local variables for the bus and slot options as well as the thisboard
pointer in order to clarify the code. Consolidate the printk's when
a supported board is not found into one dev_warn message.

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>

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 97d888f..9a29500 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1608,36 +1608,31 @@ static int rtd_dio_insn_config(struct comedi_device *dev,
 static struct pci_dev *rtd_find_pci(struct comedi_device *dev,
                                    struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
-
-       for (pcidev = pci_get_device(PCI_VENDOR_ID_RTD, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_VENDOR_ID_RTD, PCI_ANY_ID, pcidev)) {
-               int i;
+       const struct rtdBoard *thisboard;
+       struct pci_dev *pcidev = NULL;
+       int bus = it->options[0];
+       int slot = it->options[1];
+       int i;
 
-               if (it->options[0] || it->options[1]) {
-                       if (pcidev->bus->number != it->options[0]
-                           || PCI_SLOT(pcidev->devfn) != it->options[1]) {
+       for_each_pci_dev(pcidev) {
+               if (pcidev->vendor != PCI_VENDOR_ID_RTD)
+                       continue;
+               if (bus || slot) {
+                       if (pcidev->bus->number != bus ||
+                           PCI_SLOT(pcidev->devfn) != slot)
                                continue;
-                       }
                }
-               for (i = 0; i < ARRAY_SIZE(rtd520Boards); ++i) {
-                       if (pcidev->device == rtd520Boards[i].device_id) {
-                               dev->board_ptr = &rtd520Boards[i];
-                               break;
+               for (i = 0; i < ARRAY_SIZE(rtd520Boards); i++) {
+                       thisboard = &rtd520Boards[i];
+                       if (pcidev->device == thisboard->device_id) {
+                               dev->board_ptr = thisboard;
+                               return pcidev;
                        }
                }
-               if (dev->board_ptr)
-                       return pcidev;  /* found one */
-       }
-       if (!pcidev) {
-               if (it->options[0] && it->options[1]) {
-                       printk(KERN_INFO "No RTD card at bus=%d slot=%d.\n",
-                              it->options[0], it->options[1]);
-               } else {
-                       printk(KERN_INFO "No RTD card found.\n");
-               }
        }
+       dev_warn(dev->class_dev,
+               "no supported board found! (req. bus/slot: %d/%d)\n",
+               bus, slot);
        return NULL;
 }