|
@@ -212,8 +212,6 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
|
|
|
int index;
|
|
|
/* int i; */
|
|
|
|
|
|
- printk("comedi%d: cb_pcimdas: ", dev->minor);
|
|
|
-
|
|
|
/*
|
|
|
* Allocate the private structure area.
|
|
|
*/
|
|
@@ -223,7 +221,6 @@ static int cb_pcimdas_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? */
|
|
@@ -248,26 +245,26 @@ static int cb_pcimdas_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_pcimdas_boards[index].name,
|
|
|
- pcidev->bus->number, PCI_SLOT(pcidev->devfn));
|
|
|
+ dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n",
|
|
|
+ cb_pcimdas_boards[index].name, pcidev->bus->number,
|
|
|
+ PCI_SLOT(pcidev->devfn));
|
|
|
|
|
|
/* Warn about non-tested features */
|
|
|
switch (thisboard->device_id) {
|
|
|
case 0x56:
|
|
|
break;
|
|
|
default:
|
|
|
- printk("THIS CARD IS UNSUPPORTED.\n"
|
|
|
- "PLEASE REPORT USAGE TO <mocelet@sucs.org>\n");
|
|
|
+ dev_dbg(dev->hw_dev, "THIS CARD IS UNSUPPORTED.\n"
|
|
|
+ "PLEASE REPORT USAGE TO <mocelet@sucs.org>\n");
|
|
|
}
|
|
|
|
|
|
if (comedi_pci_enable(pcidev, "cb_pcimdas")) {
|
|
|
- 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;
|
|
|
}
|
|
|
|
|
@@ -333,8 +330,6 @@ found:
|
|
|
else
|
|
|
s->type = COMEDI_SUBD_UNUSED;
|
|
|
|
|
|
- printk("attached\n");
|
|
|
-
|
|
|
return 1;
|
|
|
}
|
|
|
|