staging: comedi: adl_pci7230: factor out the find PCI device code

Factor out the code that finds a matching PCI device from attach
function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adl_pci7230.c b/drivers/staging/comedi/drivers/adl_pci7230.c
index e7eb2290106afa5977e473b11e126d127b68e94d..2c8349273d7fae5f23e6e299f169ceb41607901f 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7230.c
+++ b/drivers/staging/comedi/drivers/adl_pci7230.c
@@ -80,18 +80,38 @@ static int adl_pci7230_di_insn_bits(struct comedi_device *dev,
        return 2;
 }
 
-static int adl_pci7230_attach(struct comedi_device *dev,
+static struct pci_dev *adl_pci7230_find_pci(struct comedi_device *dev,
        struct comedi_devconfig *it)
 {
        struct pci_dev *pcidev = NULL;
+       int bus = it->options[0];
+       int slot = it->options[1];
+
+       for_each_pci_dev(pcidev) {
+               if (pcidev->vendor != PCI_VENDOR_ID_ADLINK ||
+                   pcidev->device != PCI_DEVICE_ID_PCI7230)
+                       continue;
+               if (bus || slot) {
+                       /* requested particular bus/slot */
+                       if (pcidev->bus->number != bus ||
+                           PCI_SLOT(pcidev->devfn) != slot)
+                               continue;
+               }
+               return pcidev;
+       }
+       printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
+               dev->minor, bus, slot);
+       return NULL;
+}
+
+static int adl_pci7230_attach(struct comedi_device *dev,
+       struct comedi_devconfig *it)
+{
        struct comedi_subdevice *s;
-       int bus, slot;
 
        printk(KERN_INFO "comedi%d: adl_pci7230\n", dev->minor);
 
        dev->board_name = "pci7230";
-       bus = it->options[0];
-       slot = it->options[1];
 
        if (alloc_private(dev, sizeof(struct adl_pci7230_private)) < 0)
                return -ENOMEM;
@@ -99,31 +119,16 @@ static int adl_pci7230_attach(struct comedi_device *dev,
        if (alloc_subdevices(dev, 2) < 0)
                return -ENOMEM;
 
-       for_each_pci_dev(pcidev) {
-               if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&
-                       pcidev->device == PCI_DEVICE_ID_PCI7230) {
-                       if (bus || slot) {
-                               /* requested particular bus/slot */
-                               if (pcidev->bus->number != bus ||
-                                       PCI_SLOT(pcidev->devfn) != slot) {
-                                       continue;
-                               }
-                       }
-                       devpriv->pci_dev = pcidev;
-                       break;
-               }
-       }
-       if (pcidev == NULL) {
-               printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
-                       dev->minor, bus, slot);
+       devpriv->pci_dev = adl_pci7230_find_pci(dev, it);
+       if (!devpriv->pci_dev)
                return -EIO;
-       }
-       if (comedi_pci_enable(pcidev, "adl_pci7230") < 0) {
+
+       if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7230") < 0) {
                printk(KERN_ERR "comedi%d: Failed to enable PCI device and request regions\n",
                        dev->minor);
                return -EIO;
        }
-       dev->iobase = pci_resource_start(pcidev, 2);
+       dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
        printk(KERN_DEBUG "comedi: base addr %4lx\n", dev->iobase);
 
        s = dev->subdevices + 0;