|
@@ -565,8 +565,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
|
|
|
int index;
|
|
|
int i;
|
|
|
|
|
|
- printk("comedi%d: cb_pcidas: ", dev->minor);
|
|
|
-
|
|
|
/*
|
|
|
* Allocate the private structure area.
|
|
|
*/
|
|
@@ -576,7 +574,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
|
|
|
/*
|
|
|
* Probe the device to determine what device in the series it is.
|
|
|
*/
|
|
|
- printk("\n");
|
|
|
|
|
|
for_each_pci_dev(pcidev) {
|
|
|
/* is it not a computer boards card? */
|
|
@@ -600,20 +597,20 @@ static int cb_pcidas_attach(struct comedi_device *dev,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- printk("No supported ComputerBoards/MeasurementComputing card found on "
|
|
|
- "requested position\n");
|
|
|
+ dev_err(dev->hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");
|
|
|
return -EIO;
|
|
|
|
|
|
found:
|
|
|
|
|
|
- printk("Found %s on bus %i, slot %i\n", cb_pcidas_boards[index].name,
|
|
|
- pcidev->bus->number, PCI_SLOT(pcidev->devfn));
|
|
|
+ dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n",
|
|
|
+ cb_pcidas_boards[index].name, pcidev->bus->number,
|
|
|
+ PCI_SLOT(pcidev->devfn));
|
|
|
|
|
|
/*
|
|
|
* Enable PCI device and reserve I/O ports.
|
|
|
*/
|
|
|
if (comedi_pci_enable(pcidev, "cb_pcidas")) {
|
|
|
- printk(" Failed to enable PCI device and request regions\n");
|
|
|
+ dev_err(dev->hw_dev, "Failed to enable PCI device and request regions\n");
|
|
|
return -EIO;
|
|
|
}
|
|
|
/*
|
|
@@ -639,7 +636,8 @@ found:
|
|
|
/* get irq */
|
|
|
if (request_irq(devpriv->pci_dev->irq, cb_pcidas_interrupt,
|
|
|
IRQF_SHARED, "cb_pcidas", dev)) {
|
|
|
- printk(" unable to allocate irq %d\n", devpriv->pci_dev->irq);
|
|
|
+ dev_dbg(dev->hw_dev, "unable to allocate irq %d\n",
|
|
|
+ devpriv->pci_dev->irq);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
dev->irq = devpriv->pci_dev->irq;
|
|
@@ -768,7 +766,6 @@ found:
|
|
|
*/
|
|
|
static int cb_pcidas_detach(struct comedi_device *dev)
|
|
|
{
|
|
|
- printk("comedi%d: cb_pcidas: remove\n", dev->minor);
|
|
|
|
|
|
if (devpriv) {
|
|
|
if (devpriv->s5933_config) {
|