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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index fc59cb2e7eabf080c2e1069e3efd3009e76b5420..48d529e0f4de481bc5f85e9327c8d9326df72db6 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -305,20 +305,18 @@ static int parport_attach(struct comedi_device *dev,
        dev->board_name = dev->driver->driver_name;
 
        iobase = it->options[0];
-       printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase);
        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;
        }
        dev->iobase = iobase;
 
        irq = it->options[1];
        if (irq) {
-               printk(KERN_INFO " irq=%u", irq);
                ret = request_irq(irq, parport_interrupt, 0, dev->board_name,
                                  dev);
                if (ret < 0) {
-                       printk(KERN_ERR " irq not available\n");
+                       dev_err(dev->class_dev, "irq not available\n");
                        return -EINVAL;
                }
                dev->irq = irq;
@@ -379,8 +377,10 @@ static int parport_attach(struct comedi_device *dev,
        devpriv->c_data = 0;
        outb(devpriv->c_data, dev->iobase + PARPORT_C);
 
-       printk(KERN_INFO "\n");
-       return 1;
+       dev_info(dev->class_dev, "%s: iobase=0x%04lx, irq %sabled",
+               dev->board_name, dev->iobase, dev->irq ? "en" : "dis");
+
+       return 0;
 }
 
 static void parport_detach(struct comedi_device *dev)