|
@@ -667,25 +667,20 @@ static int das16m1_attach(struct comedi_device *dev,
|
|
|
|
|
|
iobase = it->options[0];
|
|
|
|
|
|
- printk("comedi%d: das16m1:", dev->minor);
|
|
|
-
|
|
|
ret = alloc_private(dev, sizeof(struct das16m1_private_struct));
|
|
|
if (ret < 0)
|
|
|
return ret;
|
|
|
|
|
|
dev->board_name = thisboard->name;
|
|
|
|
|
|
- printk(" io 0x%lx-0x%lx 0x%lx-0x%lx",
|
|
|
- iobase, iobase + DAS16M1_SIZE,
|
|
|
- iobase + DAS16M1_82C55, iobase + DAS16M1_82C55 + DAS16M1_SIZE2);
|
|
|
if (!request_region(iobase, DAS16M1_SIZE, driver_das16m1.driver_name)) {
|
|
|
- printk(" I/O port conflict\n");
|
|
|
+ comedi_error(dev, "I/O port conflict\n");
|
|
|
return -EIO;
|
|
|
}
|
|
|
if (!request_region(iobase + DAS16M1_82C55, DAS16M1_SIZE2,
|
|
|
driver_das16m1.driver_name)) {
|
|
|
release_region(iobase, DAS16M1_SIZE);
|
|
|
- printk(" I/O port conflict\n");
|
|
|
+ comedi_error(dev, "I/O port conflict\n");
|
|
|
return -EIO;
|
|
|
}
|
|
|
dev->iobase = iobase;
|
|
@@ -696,17 +691,17 @@ static int das16m1_attach(struct comedi_device *dev,
|
|
|
if (das16m1_irq_bits(irq) >= 0) {
|
|
|
ret = request_irq(irq, das16m1_interrupt, 0,
|
|
|
driver_das16m1.driver_name, dev);
|
|
|
- if (ret < 0) {
|
|
|
- printk(", irq unavailable\n");
|
|
|
+ if (ret < 0)
|
|
|
return ret;
|
|
|
- }
|
|
|
dev->irq = irq;
|
|
|
- printk(", irq %u\n", irq);
|
|
|
+ printk
|
|
|
+ ("irq %u\n", irq);
|
|
|
} else if (irq == 0) {
|
|
|
- printk(", no irq\n");
|
|
|
+ printk
|
|
|
+ (", no irq\n");
|
|
|
} else {
|
|
|
- printk(", invalid irq\n"
|
|
|
- " valid irqs are 2, 3, 5, 7, 10, 11, 12, or 15\n");
|
|
|
+ comedi_error(dev, "invalid irq\n"
|
|
|
+ " valid irqs are 2, 3, 5, 7, 10, 11, 12, or 15\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
@@ -770,7 +765,6 @@ static int das16m1_attach(struct comedi_device *dev,
|
|
|
|
|
|
static int das16m1_detach(struct comedi_device *dev)
|
|
|
{
|
|
|
- printk("comedi%d: das16m1: remove\n", dev->minor);
|
|
|
|
|
|
/* das16m1_reset(dev); */
|
|
|
|