|
@@ -466,42 +466,43 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|
|
unsigned long irq_flags;
|
|
|
int board;
|
|
|
|
|
|
- printk("comedi%d: das800: io 0x%lx", dev->minor, iobase);
|
|
|
+ dev_info(dev->hw_dev, "comedi%d: das800: io 0x%lx\n", dev->minor,
|
|
|
+ iobase);
|
|
|
if (irq)
|
|
|
- printk(", irq %u", irq);
|
|
|
- printk("\n");
|
|
|
+ dev_dbg(dev->hw_dev, "irq %u\n", irq);
|
|
|
|
|
|
/* allocate and initialize dev->private */
|
|
|
if (alloc_private(dev, sizeof(struct das800_private)) < 0)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
if (iobase == 0) {
|
|
|
- printk("io base address required for das800\n");
|
|
|
+ dev_err(dev->hw_dev, "io base address required for das800\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
/* check if io addresses are available */
|
|
|
if (!request_region(iobase, DAS800_SIZE, "das800")) {
|
|
|
- printk("I/O port conflict\n");
|
|
|
+ dev_err(dev->hw_dev, "I/O port conflict\n");
|
|
|
return -EIO;
|
|
|
}
|
|
|
dev->iobase = iobase;
|
|
|
|
|
|
board = das800_probe(dev);
|
|
|
if (board < 0) {
|
|
|
- printk("unable to determine board type\n");
|
|
|
+ dev_dbg(dev->hw_dev, "unable to determine board type\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
dev->board_ptr = das800_boards + board;
|
|
|
|
|
|
/* grab our IRQ */
|
|
|
if (irq == 1 || irq > 7) {
|
|
|
- printk("irq out of range\n");
|
|
|
+ dev_err(dev->hw_dev, "irq out of range\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
if (irq) {
|
|
|
if (request_irq(irq, das800_interrupt, 0, "das800", dev)) {
|
|
|
- printk("unable to allocate irq %u\n", irq);
|
|
|
+ dev_err(dev->hw_dev, "unable to allocate irq %u\n",
|
|
|
+ irq);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
}
|
|
@@ -557,7 +558,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|
|
|
|
|
static int das800_detach(struct comedi_device *dev)
|
|
|
{
|
|
|
- printk("comedi%d: das800: remove\n", dev->minor);
|
|
|
+ dev_info(dev->hw_dev, "comedi%d: das800: remove\n", dev->minor);
|
|
|
|
|
|
/* only free stuff if it has been allocated by _attach */
|
|
|
if (dev->iobase)
|