]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: pcl816: convert printk messages in pcl816_attach()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 26 Nov 2013 23:42:24 +0000 (16:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 Dec 2013 17:20:23 +0000 (09:20 -0800)
Convert the printk messages in this function to dev_{level} mesages.

Remove the ones that are just added noise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/pcl816.c

index 6d8dbf8d2dcfb11562fe0e98183ce91f610c2be5..d54325047af666cd07afabebd26f8aafe20c1e7f 100644 (file)
@@ -864,7 +864,7 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                return ret;
 
        if (pcl816_check(dev->iobase)) {
-               printk(KERN_ERR ", I cann't detect board. FAIL!\n");
+               dev_err(dev->class_dev, "I can't detect board. FAIL!\n");
                return -EIO;
        }
 
@@ -896,23 +896,24 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                        goto no_dma;    /* DMA disabled */
 
                if (((1 << dma) & board->DMAbits) == 0) {
-                       printk(", DMA is out of allowed range, FAIL!\n");
+                       dev_err(dev->class_dev,
+                               "DMA is out of allowed range, FAIL!\n");
                        return -EINVAL; /* Bad DMA */
                }
                ret = request_dma(dma, dev->board_name);
                if (ret) {
-                       printk(KERN_ERR
-                              ", unable to allocate DMA %u, FAIL!\n", dma);
+                       dev_err(dev->class_dev,
+                               "unable to allocate DMA %u, FAIL!\n", dma);
                        return -EBUSY;  /* DMA isn't free */
                }
 
                devpriv->dma = dma;
-               printk(KERN_INFO ", dma=%u", dma);
                pages = 2;      /* we need 16KB */
                devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
 
                if (!devpriv->dmabuf[0]) {
-                       printk(", unable to allocate DMA buffer, FAIL!\n");
+                       dev_err(dev->class_dev,
+                               "unable to allocate DMA buffer, FAIL!\n");
                        /*
                         * maybe experiment with try_to_free_pages()
                         * will help ....
@@ -925,9 +926,8 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
                devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
                if (!devpriv->dmabuf[1]) {
-                       printk(KERN_ERR
-                               ", unable to allocate DMA buffer, "
-                               "FAIL!\n");
+                       dev_err(dev->class_dev,
+                               "unable to allocate DMA buffer, FAIL!\n");
                        return -EBUSY;
                }
                devpriv->dmapages[1] = pages;
@@ -997,8 +997,6 @@ case COMEDI_SUBD_DO:
 
        pcl816_reset(dev);
 
-       printk("\n");
-
        return 0;
 }