renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 23:53:55 +08:00
Code

staging: comedi: cb_pcidas: move the "find pci" dev_printk messages

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-06-26 18:01:51 -07:00 committed by Greg Kroah-Hartman
parent f3c34b2fc6
commit b8ac8c6342
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/cb_pcidas.c
View File

@ -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;
}
@ -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,