Skip to content

Commit

Permalink
staging: comedi: cb_pcidas: move the "find pci" dev_printk messages
Browse files Browse the repository at this point in the history
Move the dev_printk messages associated with the "find pci device"
from the *attach function into the *find_pci_device function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent f3c34b2 commit b8ac8c6
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -1537,10 +1537,15 @@ static struct pci_dev *cb_pcidas_find_pci_device(struct comedi_device *dev,
continue;
}
}
dev_dbg(dev->class_dev,
"Found %s on bus %i, slot %i\n",
thisboard->name,
pcidev->bus->number, PCI_SLOT(pcidev->devfn));
dev->board_ptr = thisboard;
return pcidev;
}
}
dev_err(dev->class_dev, "No supported card found\n");
return NULL;
}

Expand All @@ -1558,15 +1563,9 @@ static int cb_pcidas_attach(struct comedi_device *dev,
devpriv = dev->private;

devpriv->pci_dev = cb_pcidas_find_pci_device(dev, it);
if (!devpriv->pci_dev) {
dev_err(dev->class_dev, "No supported card found\n");
if (!devpriv->pci_dev)
return -EIO;
}

thisboard = comedi_board(dev);
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(devpriv->pci_dev, "cb_pcidas")) {
dev_err(dev->class_dev,
Expand Down

0 comments on commit b8ac8c6

Please sign in to comment.