Factor the "find pci device" code out of the attach function.
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/cb_pcidio.c | 56 ++++++++++++++++--------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c
b/drivers/staging/comedi/drivers/cb_pcidio.c
index 9160859..582ff3b 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -111,35 +111,19 @@ struct pcidio_private {
*/
#define devpriv ((struct pcidio_private *)dev->private)
-static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig
*it)
+static struct pci_dev *pcidio_find_pci_dev(struct comedi_device *dev,
+ struct comedi_devconfig *it)
{
struct pci_dev *pcidev = NULL;
- int index;
int i;
- int ret;
-
-/*
- * Allocate the private structure area. alloc_private() is a
- * convenient macro defined in comedidev.h.
- */
- if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
- return -ENOMEM;
-/*
- * If you can probe the device to determine what device in a series
- * it is, this is the place to do it. Otherwise, dev->board_ptr
- * should already be initialized.
- */
-/*
- * Probe the device to determine what device in the series it is.
- */
for_each_pci_dev(pcidev) {
/* is it not a computer boards card? */
if (pcidev->vendor != PCI_VENDOR_ID_CB)
continue;
/* loop through cards supported by this driver */
- for (index = 0; index < ARRAY_SIZE(pcidio_boards); index++) {
- if (pcidio_boards[index].dev_id != pcidev->device)
+ for (i = 0; i < ARRAY_SIZE(pcidio_boards); i++) {
+ if (pcidio_boards[i].dev_id != pcidev->device)
continue;
/* was a particular bus/slot requested? */
@@ -150,14 +134,14 @@ static int pcidio_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
continue;
}
}
- dev->board_ptr = pcidio_boards + index;
+ dev->board_ptr = pcidio_boards + i;
goto found;
}
}
dev_err(dev->class_dev,
"No supported ComputerBoards/MeasurementComputing card found on
requested position\n");
- return -EIO;
+ return NULL;
found:
@@ -167,17 +151,35 @@ found:
*/
dev->board_name = thisboard->name;
- devpriv->pci_dev = pcidev;
dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
- thisboard->name, devpriv->pci_dev->bus->number,
- PCI_SLOT(devpriv->pci_dev->devfn));
- if (comedi_pci_enable(pcidev, thisboard->name))
+ thisboard->name, pcidev->bus->number,
+ PCI_SLOT(pcidev->devfn));
+ return pcidev;
+}
+
+static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig
*it)
+{
+ int i;
+ int ret;
+
+/*
+ * Allocate the private structure area. alloc_private() is a
+ * convenient macro defined in comedidev.h.
+ */
+ if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
+ return -ENOMEM;
+
+ devpriv->pci_dev = pcidio_find_pci_dev(dev, it);
+ if (!devpriv->pci_dev)
+ return -EIO;
+
+ if (comedi_pci_enable(devpriv->pci_dev, thisboard->name))
return -EIO;
devpriv->dio_reg_base
=
pci_resource_start(devpriv->pci_dev,
- pcidio_boards[index].dioregs_badrindex);
+ thisboard->dioregs_badrindex);
ret = comedi_alloc_subdevices(dev, thisboard->n_8255);
if (ret)
--
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/
