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

staging: comedi: pcl816: convert printk messages in pcl816_attach()

Convert the printk messages in this function to dev_{level} mesages.

Remove the ones that are just added noise.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e21f20e7
...@@ -864,7 +864,7 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -864,7 +864,7 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return ret; return ret;
if (pcl816_check(dev->iobase)) { 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; return -EIO;
} }
...@@ -896,23 +896,24 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -896,23 +896,24 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
goto no_dma; /* DMA disabled */ goto no_dma; /* DMA disabled */
if (((1 << dma) & board->DMAbits) == 0) { 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 */ return -EINVAL; /* Bad DMA */
} }
ret = request_dma(dma, dev->board_name); ret = request_dma(dma, dev->board_name);
if (ret) { if (ret) {
printk(KERN_ERR dev_err(dev->class_dev,
", unable to allocate DMA %u, FAIL!\n", dma); "unable to allocate DMA %u, FAIL!\n", dma);
return -EBUSY; /* DMA isn't free */ return -EBUSY; /* DMA isn't free */
} }
devpriv->dma = dma; devpriv->dma = dma;
printk(KERN_INFO ", dma=%u", dma);
pages = 2; /* we need 16KB */ pages = 2; /* we need 16KB */
devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages); devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
if (!devpriv->dmabuf[0]) { 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() * maybe experiment with try_to_free_pages()
* will help .... * will help ....
...@@ -925,9 +926,8 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -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); devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
if (!devpriv->dmabuf[1]) { if (!devpriv->dmabuf[1]) {
printk(KERN_ERR dev_err(dev->class_dev,
", unable to allocate DMA buffer, " "unable to allocate DMA buffer, FAIL!\n");
"FAIL!\n");
return -EBUSY; return -EBUSY;
} }
devpriv->dmapages[1] = pages; devpriv->dmapages[1] = pages;
...@@ -997,8 +997,6 @@ case COMEDI_SUBD_DO: ...@@ -997,8 +997,6 @@ case COMEDI_SUBD_DO:
pcl816_reset(dev); pcl816_reset(dev);
printk("\n");
return 0; return 0;
} }
......
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