From 8d9681b45d88e541a2e3a5750b3228cba6ae1e2d Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 18:42:57 -0700 Subject: [PATCH] --- yaml --- r: 318083 b: refs/heads/master c: 88262703416be01d6770fbf55737e73edb60ee16 h: refs/heads/master i: 318081: 29698136accd7beebf2d1295c2eb2e5a5f9c697a 318079: 2136ee3bb05dd03d9f9baaf5bca75539fcae3bbf v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/cb_pcidas64.c | 34 ++++++++----------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index beeaa0f46062..64a8480571b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eeff9dbc6f7513b88163253b782b7e5a4b087cdd +refs/heads/master: 88262703416be01d6770fbf55737e73edb60ee16 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c index 704f5ea2e9cd..d1b0327b6d13 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1654,33 +1654,29 @@ static struct pci_dev *cb_pcidas64_find_pci_dev(struct comedi_device *dev, struct comedi_devconfig *it) { struct pci_dev *pcidev = NULL; - int index; + 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 (bus || slot) { + if (bus != pcidev->bus->number || + slot != PCI_SLOT(pcidev->devfn)) + continue; + } if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS) continue; - /* loop through cards supported by this driver */ - for (index = 0; index < ARRAY_SIZE(pcidas64_boards); index++) { - if (pcidas64_boards[index].device_id != pcidev->device) + + for (i = 0; i < ARRAY_SIZE(pcidas64_boards); i++) { + if (pcidas64_boards[i].device_id != pcidev->device) 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; - } - } - dev->board_ptr = pcidas64_boards + index; - dev_dbg(dev->class_dev, "Found %s on bus %i, slot %i\n", - board(dev)->name, - pcidev->bus->number, PCI_SLOT(pcidev->devfn)); + dev->board_ptr = pcidas64_boards + i; return pcidev; } } - - printk("No supported ComputerBoards/MeasurementComputing card found\n"); + dev_err(dev->class_dev, + "No supported board found! (req. bus %d, slot %d)\n", + bus, slot); return NULL; }