]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: comedi: fix printk issue in pcl818.c
authorRavishankar karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Sat, 19 Nov 2011 04:36:55 +0000 (10:06 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 02:50:46 +0000 (18:50 -0800)
This is a patch to the pcl818.c file that fixes up a printk
warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/drivers/pcl818.c

index 4e134e9d06ccc642ced2a7414c54c8cf61ac372c..c207b253dd45c81c8777186b468d0c30750071e0 100644 (file)
@@ -1745,22 +1745,23 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        /* claim our I/O space */
        iobase = it->options[0];
-       printk("comedi%d: pcl818:  board=%s, ioport=0x%03lx",
-              dev->minor, this_board->name, iobase);
+       printk
+           ("comedi%d: pcl818:  board=%s, ioport=0x%03lx",
+            dev->minor, this_board->name, iobase);
        devpriv->io_range = this_board->io_range;
        if ((this_board->fifo) && (it->options[2] == -1)) {     /*  we've board with FIFO and we want to use FIFO */
                devpriv->io_range = PCLx1xFIFO_RANGE;
                devpriv->usefifo = 1;
        }
        if (!request_region(iobase, devpriv->io_range, "pcl818")) {
-               printk("I/O port conflict\n");
+               comedi_error(dev, "I/O port conflict\n");
                return -EIO;
        }
 
        dev->iobase = iobase;
 
        if (pcl818_check(iobase)) {
-               printk(", I can't detect board. FAIL!\n");
+               comedi_error(dev, "I can't detect board. FAIL!\n");
                return -EIO;
        }
 
@@ -1784,7 +1785,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                             irq);
                                        irq = 0;        /* Can't use IRQ */
                                } else {
-                                       printk(", irq=%u", irq);
+                                       printk(KERN_DEBUG "irq=%u", irq);
                                }
                        }
                }
@@ -1815,7 +1816,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                 "pcl818 DMA (RTC)", dev)) {
                        devpriv->dma_rtc = 1;
                        devpriv->rtc_irq = RTC_IRQ;
-                       printk(", dma_irq=%u", devpriv->rtc_irq);
+                       printk(KERN_DEBUG "dma_irq=%u", devpriv->rtc_irq);
                } else {
                        RTC_lock--;
                        if (RTC_lock == 0) {