staging: comedi: adl_pci7296: factor out the PCI device code

Factor out the code that finds a matching PCI device from attach
function. This allows reducing the indent level of the remaining
code in the 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_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index bf2f7fb86d77d0e4469bf10034e4f966e113bee9..0b8b2798312294903c30c8a5c8da313e160753a3 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -54,19 +54,40 @@ struct adl_pci7296_private {
 
 #define devpriv ((struct adl_pci7296_private *)dev->private)
 
+static struct pci_dev *adl_pci7296_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_PCI7296)
+                       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_pci7296_attach(struct comedi_device *dev,
                              struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev = NULL;
        struct comedi_subdevice *s;
-       int bus, slot;
        int ret;
 
        printk(KERN_INFO "comedi%d: attach adl_pci7432\n", dev->minor);
 
        dev->board_name = "pci7432";
-       bus = it->options[0];
-       slot = it->options[1];
 
        if (alloc_private(dev, sizeof(struct adl_pci7296_private)) < 0)
                return -ENOMEM;
@@ -74,63 +95,45 @@ static int adl_pci7296_attach(struct comedi_device *dev,
        if (alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 
-       for_each_pci_dev(pcidev) {
-               if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&
-                   pcidev->device == PCI_DEVICE_ID_PCI7296) {
-                       if (bus || slot) {
-                               /* requested particular bus/slot */
-                               if (pcidev->bus->number != bus
-                                   || PCI_SLOT(pcidev->devfn) != slot) {
-                                       continue;
-                               }
-                       }
-                       devpriv->pci_dev = pcidev;
-                       if (comedi_pci_enable(pcidev, "adl_pci7296") < 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);
-                       printk(KERN_INFO "comedi: base addr %4lx\n",
-                               dev->iobase);
-
-                       /*  four 8255 digital io subdevices */
-                       s = dev->subdevices + 0;
-                       subdev_8255_init(dev, s, NULL,
-                                        (unsigned long)(dev->iobase));
-
-                       s = dev->subdevices + 1;
-                       ret = subdev_8255_init(dev, s, NULL,
-                                              (unsigned long)(dev->iobase +
-                                                              PORT2A));
-                       if (ret < 0)
-                               return ret;
-
-                       s = dev->subdevices + 2;
-                       ret = subdev_8255_init(dev, s, NULL,
-                                              (unsigned long)(dev->iobase +
-                                                              PORT3A));
-                       if (ret < 0)
-                               return ret;
-
-                       s = dev->subdevices + 3;
-                       ret = subdev_8255_init(dev, s, NULL,
-                                              (unsigned long)(dev->iobase +
-                                                              PORT4A));
-                       if (ret < 0)
-                               return ret;
-
-                       printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n",
-                               dev->minor);
-
-                       return 1;
-               }
+       devpriv->pci_dev = adl_pci7296_find_pci(dev, it);
+       if (!devpriv->pci_dev)
+               return -EIO;
+
+       if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7296") < 0) {
+               printk(KERN_ERR
+                       "comedi%d: Failed to enable PCI device and request regions\n",
+                       dev->minor);
+               return -EIO;
        }
 
-       printk(KERN_ERR "comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
-              dev->minor, bus, slot);
-       return -EIO;
+       dev->iobase = pci_resource_start(devpriv->pci_dev, 2);
+       printk(KERN_INFO "comedi: base addr %4lx\n", dev->iobase);
+
+       /*  four 8255 digital io subdevices */
+       s = dev->subdevices + 0;
+       subdev_8255_init(dev, s, NULL, (unsigned long)(dev->iobase));
+
+       s = dev->subdevices + 1;
+       ret = subdev_8255_init(dev, s, NULL,
+                               (unsigned long)(dev->iobase + PORT2A));
+       if (ret < 0)
+               return ret;
+
+       s = dev->subdevices + 2;
+       ret = subdev_8255_init(dev, s, NULL,
+                               (unsigned long)(dev->iobase + PORT3A));
+       if (ret < 0)
+               return ret;
+
+       s = dev->subdevices + 3;
+       ret = subdev_8255_init(dev, s, NULL,
+                               (unsigned long)(dev->iobase + PORT4A));
+       if (ret < 0)
+               return ret;
+
+       printk(KERN_DEBUG "comedi%d: adl_pci7432 attached\n", dev->minor);
+
+       return 0;
 }
 
 static void adl_pci7296_detach(struct comedi_device *dev)