---

yaml
---
r: 318069
b: refs/heads/master
c: 41f7ea3
h: refs/heads/master
i:
  318067: e186ab8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba36b9ba768b5d617f0729eeebef16dc8416c750
+refs/heads/master: 41f7ea34f53ea432f77129b81db6d880d4cfa648

trunk/drivers/staging/comedi/drivers/cb_pcidio.c

@@ -111,27 +111,11 @@ 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? */
@@ -151,33 +135,45 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 				}
 			}
 			dev->board_ptr = pcidio_boards + index;
-			goto found;
+			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));
+			return pcidev;
 		}
 	}
-
 	dev_err(dev->class_dev,
 		"No supported ComputerBoards/MeasurementComputing card found on requested position\n");
-	return -EIO;
+	return NULL;
+}
+
+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;
 
-found:
+	devpriv->pci_dev = pcidio_find_pci_dev(dev, it);
+	if (!devpriv->pci_dev)
+		return -EIO;
 
 /*
  * Initialize dev->board_name.  Note that we can use the "thisboard"
  * macro now, since we just initialized it in the last line.
  */
 	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))
+	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);
+	    pci_resource_start(devpriv->pci_dev, thisboard->dioregs_badrindex);
 
 	ret = comedi_alloc_subdevices(dev, thisboard->n_8255);
 	if (ret)