[PATCH 15/30] staging: comedi: cb_pcidio: cleanup the "find pci device" code

[PATCH 15/30] staging: comedi: cb_pcidio: cleanup the "find pci device" code

[H Hartley Sweeten]

Cleanup the "find pci device" code to follow the format of the
other comedi pci drivers.

Create local variables for the bus and slot options to clarify the
code. Reoder the tests so that if a bus/slot is requested the
loop checking against the boardinfo is not performed. Refactor
the code to remove the need for the 'goto'. Reword the messages
a bit. Also, move the setting of the dev->board_name back into the
attach.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/cb_pcidio.c | 47 ++++++++++++------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c
index 582ff3b..2414d5a 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -115,46 +115,33 @@ static struct pci_dev *pcidio_find_pci_dev(struct comedi_device *dev,
 					   struct comedi_devconfig *it)
 {
 	struct pci_dev *pcidev = NULL;
+	int bus = it->options[0];
+	int slot = it->options[1];
 	int i;
 
 	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 (i = 0; i < ARRAY_SIZE(pcidio_boards); i++) {
-			if (pcidio_boards[i].dev_id != pcidev->device)
+		if (bus || slot) {
+			if (pcidev->bus->number != bus ||
+			    PCI_SLOT(pcidev->devfn) != slot)
 				continue;
-
-			/*  was a particular bus/slot requested? */
-			if (it->options[0] || it->options[1]) {
-				/*  are we on the wrong bus/slot? */
-				if (pcidev->bus->number != it->options[0] ||
-				    PCI_SLOT(pcidev->devfn) != it->options[1]) {
-					continue;
-				}
+		}
+		for (i = 0; i < ARRAY_SIZE(pcidio_boards); i++) {
+			if (pcidio_boards[i].dev_id == pcidev->device) {
+				dev->board_ptr = pcidio_boards + i;
+				dev_dbg(dev->class_dev,
+					"Found %s on bus %i, slot %i\n",
+					thisboard->name, pcidev->bus->number,
+					PCI_SLOT(pcidev->devfn));
+				return pcidev;
 			}
-			dev->board_ptr = pcidio_boards + i;
-			goto found;
 		}
 	}
-
 	dev_err(dev->class_dev,
-		"No supported ComputerBoards/MeasurementComputing card found on requested position\n");
+		"No supported board found! (req. bus/slot: %d/%d)\n",
+		bus, slot);
 	return NULL;
-
-found:
-
-/*
- * 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;
-
-	dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n",
-		thisboard->name, pcidev->bus->number,
-		PCI_SLOT(pcidev->devfn));
-	return pcidev;
 }
 
 static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
@@ -173,6 +160,8 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	if (!devpriv->pci_dev)
 		return -EIO;
 
+	dev->board_name = thisboard->name;
+
 	if (comedi_pci_enable(devpriv->pci_dev, thisboard->name))
 		return -EIO;
 
-- 
1.7.11