Staging: comedi: ssv_dnp: fix checkpatch.pl warning
authorGüngör Erseymen <gelurine@gmail.com>
Fri, 10 Aug 2012 12:54:40 +0000 (15:54 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Aug 2012 01:32:44 +0000 (18:32 -0700)
Fix checkpatch.pl warning about printk issue by merging two printk
calls into one dev_info call.

Signed-off-by: Güngör Erseymen <gelurine@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ssv_dnp.c

index 84b9f2a4280b6450fdc7da54bc166f0bf88694e7..d1f5118c3afa2b71bca68b598ba2f91240e68a97 100644 (file)
@@ -177,8 +177,6 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct comedi_subdevice *s;
        int ret;
 
-       printk(KERN_INFO "comedi%d: dnp: ", dev->minor);
-
        dev->board_name = board->name;
 
        ret = comedi_alloc_subdevices(dev, 1);
@@ -195,8 +193,6 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        s->insn_bits = dnp_dio_insn_bits;
        s->insn_config = dnp_dio_insn_config;
 
-       printk("attached\n");
-
        /* We use the I/O ports 0x22,0x23 and 0xa3-0xa9, which are always
         * allocated for the primary 8259, so we don't need to allocate them
         * ourselves. */
@@ -209,6 +205,7 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        outb(PCMR, CSCIR);
        outb((inb(CSCDR) & 0xAA), CSCDR);
 
+       dev_info(dev->class_dev, "%s: attached\n", dev->board_name);
        return 1;
 }