|
@@ -184,8 +184,6 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|
|
int index;
|
|
|
int i;
|
|
|
|
|
|
- printk("comedi%d: cb_pcidio: \n", dev->minor);
|
|
|
-
|
|
|
/*
|
|
|
* Allocate the private structure area. alloc_private() is a
|
|
|
* convenient macro defined in comedidev.h.
|
|
@@ -223,8 +221,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- 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:
|
|
@@ -236,14 +233,12 @@ found:
|
|
|
dev->board_name = thisboard->name;
|
|
|
|
|
|
devpriv->pci_dev = pcidev;
|
|
|
- printk("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(pcidev, thisboard->name)) {
|
|
|
- printk
|
|
|
- ("cb_pcidio: failed to enable PCI device and request regions\n");
|
|
|
+ dev_dbg(dev->hw_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(pcidev, thisboard->name))
|
|
|
return -EIO;
|
|
|
- }
|
|
|
+
|
|
|
devpriv->dio_reg_base
|
|
|
=
|
|
|
pci_resource_start(devpriv->pci_dev,
|
|
@@ -259,11 +254,10 @@ found:
|
|
|
for (i = 0; i < thisboard->n_8255; i++) {
|
|
|
subdev_8255_init(dev, dev->subdevices + i,
|
|
|
NULL, devpriv->dio_reg_base + i * 4);
|
|
|
- printk(" subdev %d: base = 0x%lx\n", i,
|
|
|
- devpriv->dio_reg_base + i * 4);
|
|
|
+ dev_dbg(dev->hw_dev, "subdev %d: base = 0x%lx\n", i,
|
|
|
+ devpriv->dio_reg_base + i * 4);
|
|
|
}
|
|
|
|
|
|
- printk("attached\n");
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -277,7 +271,6 @@ found:
|
|
|
*/
|
|
|
static int pcidio_detach(struct comedi_device *dev)
|
|
|
{
|
|
|
- printk("comedi%d: cb_pcidio: remove\n", dev->minor);
|
|
|
if (devpriv) {
|
|
|
if (devpriv->pci_dev) {
|
|
|
if (devpriv->dio_reg_base)
|