aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-11-26 18:42:19 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-03 12:20:22 -0500
commitd65e5b9d918aecd992947f1494ffb92b38c5f349 (patch)
treeae9f06bd27d3f97a5e8fa33e4bf3b5afc645ecd1
parente30b22a9ccbe0b3c2e9c68ab3e46c69f56c3ae35 (diff)
staging: comedi: pcl818: convert printk() messages to dev_{level}
Convert the remaining printk messsages in this driver to dev_{level}. 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>
-rw-r--r--drivers/staging/comedi/drivers/pcl818.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 15b424733a9e..cacdca0983bb 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -463,10 +463,10 @@ conv_finish:
463 outb(0, dev->iobase + PCL818_CLRINT); /* clear INT request */ 463 outb(0, dev->iobase + PCL818_CLRINT); /* clear INT request */
464 464
465 if ((low & 0xf) != devpriv->act_chanlist[devpriv->act_chanlist_pos]) { /* dropout! */ 465 if ((low & 0xf) != devpriv->act_chanlist[devpriv->act_chanlist_pos]) { /* dropout! */
466 printk 466 dev_dbg(dev->class_dev,
467 ("comedi: A/D mode1/3 IRQ - channel dropout %x!=%x !\n", 467 "A/D mode1/3 IRQ - channel dropout %x!=%x !\n",
468 (low & 0xf), 468 (low & 0xf),
469 devpriv->act_chanlist[devpriv->act_chanlist_pos]); 469 devpriv->act_chanlist[devpriv->act_chanlist_pos]);
470 pcl818_ai_cancel(dev, s); 470 pcl818_ai_cancel(dev, s);
471 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 471 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
472 comedi_event(dev, s); 472 comedi_event(dev, s);
@@ -532,11 +532,11 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)
532 532
533 for (i = 0; i < len; i++) { 533 for (i = 0; i < len; i++) {
534 if ((ptr[bufptr] & 0xf) != devpriv->act_chanlist[devpriv->act_chanlist_pos]) { /* dropout! */ 534 if ((ptr[bufptr] & 0xf) != devpriv->act_chanlist[devpriv->act_chanlist_pos]) { /* dropout! */
535 printk 535 dev_dbg(dev->class_dev,
536 ("comedi: A/D mode1/3 DMA - channel dropout %d(card)!=%d(chanlist) at %d !\n", 536 "A/D mode1/3 DMA - channel dropout %d(card)!=%d(chanlist) at %d !\n",
537 (ptr[bufptr] & 0xf), 537 (ptr[bufptr] & 0xf),
538 devpriv->act_chanlist[devpriv->act_chanlist_pos], 538 devpriv->act_chanlist[devpriv->act_chanlist_pos],
539 devpriv->act_chanlist_pos); 539 devpriv->act_chanlist_pos);
540 pcl818_ai_cancel(dev, s); 540 pcl818_ai_cancel(dev, s);
541 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 541 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
542 comedi_event(dev, s); 542 comedi_event(dev, s);
@@ -609,10 +609,10 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
609 for (i = 0; i < len; i++) { 609 for (i = 0; i < len; i++) {
610 lo = inb(dev->iobase + PCL818_FI_DATALO); 610 lo = inb(dev->iobase + PCL818_FI_DATALO);
611 if ((lo & 0xf) != devpriv->act_chanlist[devpriv->act_chanlist_pos]) { /* dropout! */ 611 if ((lo & 0xf) != devpriv->act_chanlist[devpriv->act_chanlist_pos]) { /* dropout! */
612 printk 612 dev_dbg(dev->class_dev,
613 ("comedi: A/D mode1/3 FIFO - channel dropout %d!=%d !\n", 613 "A/D mode1/3 FIFO - channel dropout %d!=%d !\n",
614 (lo & 0xf), 614 (lo & 0xf),
615 devpriv->act_chanlist[devpriv->act_chanlist_pos]); 615 devpriv->act_chanlist[devpriv->act_chanlist_pos]);
616 pcl818_ai_cancel(dev, s); 616 pcl818_ai_cancel(dev, s);
617 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 617 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
618 comedi_event(dev, s); 618 comedi_event(dev, s);
@@ -1249,7 +1249,8 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
1249 if (dma < 1) 1249 if (dma < 1)
1250 goto no_dma; /* DMA disabled */ 1250 goto no_dma; /* DMA disabled */
1251 if (((1 << dma) & board->DMAbits) == 0) { 1251 if (((1 << dma) & board->DMAbits) == 0) {
1252 printk(KERN_ERR "DMA is out of allowed range, FAIL!\n"); 1252 dev_err(dev->class_dev,
1253 "DMA is out of allowed range, FAIL!\n");
1253 return -EINVAL; /* Bad DMA */ 1254 return -EINVAL; /* Bad DMA */
1254 } 1255 }
1255 ret = request_dma(dma, dev->board_name); 1256 ret = request_dma(dma, dev->board_name);