aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-11-26 18:41:33 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-03 12:20:19 -0500
commit96a1f91ae2959e977e261528d4b0fb16a37f1d06 (patch)
tree53e47df4deef833df6fc59b82502ce153ab7718e
parent15d2006970edfc580e1508f96bbbf788ffb991e4 (diff)
staging: comedi: adv_pci1710: convert some printk's to dev_dbg()
Convert these debug messages to dev_dbg(). 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/adv_pci1710.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index bac5e0dcc685..a1519c98022f 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -740,16 +740,15 @@ static void interrupt_pci1710_every_sample(void *d)
740 740
741 m = inw(dev->iobase + PCI171x_STATUS); 741 m = inw(dev->iobase + PCI171x_STATUS);
742 if (m & Status_FE) { 742 if (m & Status_FE) {
743 printk("comedi%d: A/D FIFO empty (%4x)\n", dev->minor, m); 743 dev_dbg(dev->class_dev, "A/D FIFO empty (%4x)\n", m);
744 pci171x_ai_cancel(dev, s); 744 pci171x_ai_cancel(dev, s);
745 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 745 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
746 comedi_event(dev, s); 746 comedi_event(dev, s);
747 return; 747 return;
748 } 748 }
749 if (m & Status_FF) { 749 if (m & Status_FF) {
750 printk 750 dev_dbg(dev->class_dev,
751 ("comedi%d: A/D FIFO Full status (Fatal Error!) (%4x)\n", 751 "A/D FIFO Full status (Fatal Error!) (%4x)\n", m);
752 dev->minor, m);
753 pci171x_ai_cancel(dev, s); 752 pci171x_ai_cancel(dev, s);
754 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 753 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
755 comedi_event(dev, s); 754 comedi_event(dev, s);
@@ -825,12 +824,12 @@ static int move_block_from_fifo(struct comedi_device *dev,
825 sampl = inw(dev->iobase + PCI171x_AD_DATA); 824 sampl = inw(dev->iobase + PCI171x_AD_DATA);
826 if (this_board->cardtype != TYPE_PCI1713) 825 if (this_board->cardtype != TYPE_PCI1713)
827 if ((sampl & 0xf000) != devpriv->act_chanlist[j]) { 826 if ((sampl & 0xf000) != devpriv->act_chanlist[j]) {
828 printk 827 dev_dbg(dev->class_dev,
829 ("comedi%d: A/D FIFO data dropout: received data from channel %d, expected %d! (%d/%d/%d/%d/%d/%4x)\n", 828 "A/D FIFO data dropout: received data from channel %d, expected %d! (%d/%d/%d/%d/%d/%4x)\n",
830 dev->minor, (sampl & 0xf000) >> 12, 829 (sampl & 0xf000) >> 12,
831 (devpriv->act_chanlist[j] & 0xf000) >> 12, 830 (devpriv->act_chanlist[j] & 0xf000) >> 12,
832 i, j, devpriv->ai_act_scan, n, turn, 831 i, j, devpriv->ai_act_scan, n, turn,
833 sampl); 832 sampl);
834 pci171x_ai_cancel(dev, s); 833 pci171x_ai_cancel(dev, s);
835 s->async->events |= 834 s->async->events |=
836 COMEDI_CB_EOA | COMEDI_CB_ERROR; 835 COMEDI_CB_EOA | COMEDI_CB_ERROR;
@@ -865,17 +864,15 @@ static void interrupt_pci1710_half_fifo(void *d)
865 864
866 m = inw(dev->iobase + PCI171x_STATUS); 865 m = inw(dev->iobase + PCI171x_STATUS);
867 if (!(m & Status_FH)) { 866 if (!(m & Status_FH)) {
868 printk("comedi%d: A/D FIFO not half full! (%4x)\n", 867 dev_dbg(dev->class_dev, "A/D FIFO not half full! (%4x)\n", m);
869 dev->minor, m);
870 pci171x_ai_cancel(dev, s); 868 pci171x_ai_cancel(dev, s);
871 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 869 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
872 comedi_event(dev, s); 870 comedi_event(dev, s);
873 return; 871 return;
874 } 872 }
875 if (m & Status_FF) { 873 if (m & Status_FF) {
876 printk 874 dev_dbg(dev->class_dev,
877 ("comedi%d: A/D FIFO Full status (Fatal Error!) (%4x)\n", 875 "A/D FIFO Full status (Fatal Error!) (%4x)\n", m);
878 dev->minor, m);
879 pci171x_ai_cancel(dev, s); 876 pci171x_ai_cancel(dev, s);
880 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 877 s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
881 comedi_event(dev, s); 878 comedi_event(dev, s);