Commit b8d0f3ae authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: comedi_parport: cleanup 'attach' printk's

Convert the printk messages in the 'attach' to dev_printk messages.
Consolidate the attach message into one message after the device
is attached.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 45d63700
...@@ -305,20 +305,18 @@ static int parport_attach(struct comedi_device *dev, ...@@ -305,20 +305,18 @@ static int parport_attach(struct comedi_device *dev,
dev->board_name = dev->driver->driver_name; dev->board_name = dev->driver->driver_name;
iobase = it->options[0]; iobase = it->options[0];
printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PARPORT_SIZE, dev->board_name)) { if (!request_region(iobase, PARPORT_SIZE, dev->board_name)) {
printk(KERN_ERR "I/O port conflict\n"); dev_err(dev->class_dev, "I/O port conflict\n");
return -EIO; return -EIO;
} }
dev->iobase = iobase; dev->iobase = iobase;
irq = it->options[1]; irq = it->options[1];
if (irq) { if (irq) {
printk(KERN_INFO " irq=%u", irq);
ret = request_irq(irq, parport_interrupt, 0, dev->board_name, ret = request_irq(irq, parport_interrupt, 0, dev->board_name,
dev); dev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR " irq not available\n"); dev_err(dev->class_dev, "irq not available\n");
return -EINVAL; return -EINVAL;
} }
dev->irq = irq; dev->irq = irq;
...@@ -379,8 +377,10 @@ static int parport_attach(struct comedi_device *dev, ...@@ -379,8 +377,10 @@ static int parport_attach(struct comedi_device *dev,
devpriv->c_data = 0; devpriv->c_data = 0;
outb(devpriv->c_data, dev->iobase + PARPORT_C); outb(devpriv->c_data, dev->iobase + PARPORT_C);
printk(KERN_INFO "\n"); dev_info(dev->class_dev, "%s: iobase=0x%04lx, irq %sabled",
return 1; dev->board_name, dev->iobase, dev->irq ? "en" : "dis");
return 0;
} }
static void parport_detach(struct comedi_device *dev) static void parport_detach(struct comedi_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment