summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/s526.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-09-19 15:09:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-21 09:19:42 -0700
commit898143bd1ac1550f3b2b2eaf397b13fc1d1889d1 (patch)
tree7753a4c2f9cffc34ec12af6131a2988103dbf2d1 /drivers/staging/comedi/drivers/s526.c
parent36fe5d265d394ce6889970665abcbc259d92c1cf (diff)
staging: comedi: s526: remove commented out debug messages
These messages should be removed from the final driver. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/s526.c')
-rw-r--r--drivers/staging/comedi/drivers/s526.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index 9abbf1b9084f..75e3e58e552a 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -228,8 +228,6 @@ static int s526_gpct_rinsn(struct comedi_device *dev,
datahigh = inw(dev->iobase + REG_C0H + counter_channel * 8);
data[i] = (int)(datahigh & 0x00FF);
data[i] = (data[i] << 16) | (datalow & 0xFFFF);
- /* printk("s526 GPCT[%d]: %x(0x%04x, 0x%04x)\n",
- counter_channel, data[i], datahigh, datalow); */
}
return i;
}
@@ -244,13 +242,8 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
short value;
union cmReg cmReg;
- /* printk("s526: GPCT_INSN_CONFIG: Configuring Channel %d\n",
- subdev_channel); */
-
- for (i = 0; i < MAX_GPCT_CONFIG_DATA; i++) {
+ for (i = 0; i < MAX_GPCT_CONFIG_DATA; i++)
devpriv->s526_gpct_config[subdev_channel].data[i] = data[i];
-/* printk("data[%d]=%x\n", i, data[i]); */
- }
/* Check what type of Counter the user requested, data[0] contains */
/* the Application type */
@@ -299,8 +292,6 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
#if 1
/* Set Counter Mode Register */
cmReg.value = data[1] & 0xFFFF;
-
-/* printk("s526: Counter Mode register=%x\n", cmReg.value); */
outw(cmReg.value, dev->iobase + REG_C0M + subdev_channel * 8);
/* Reset the counter if it is software preload */
@@ -546,7 +537,6 @@ static int s526_ai_insn_config(struct comedi_device *dev,
/* Enable ADC interrupt */
outw(ISR_ADC_DONE, dev->iobase + REG_IER);
-/* printk("s526: ADC current value: 0x%04x\n", inw(dev->iobase + REG_ADC)); */
devpriv->s526_ai_config = (data[0] & 0x3FF) << 5;
if (data[1] > 0)
devpriv->s526_ai_config |= 0x8000; /* set the delay */
@@ -579,8 +569,6 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
for (n = 0; n < insn->n; n++) {
/* trigger conversion */
outw(value, dev->iobase + REG_ADC);
-/* printk("s526: Wrote 0x%04x to ADC\n", value); */
-/* printk("s526: ADC reg=0x%04x\n", inw(dev->iobase + REG_ADC)); */
#define TIMEOUT 100
/* wait for conversion to end */
@@ -601,7 +589,6 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
/* read data */
d = inw(dev->iobase + REG_ADD);
-/* printk("AI[%d]=0x%04x\n", n, (unsigned short)(d & 0xFFFF)); */
/* munge data */
data[n] = d ^ 0x8000;
@@ -619,7 +606,6 @@ static int s526_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
int chan = CR_CHAN(insn->chanspec);
unsigned short val;
-/* printk("s526_ao_winsn\n"); */
val = chan << 1;
/* outw(val, dev->iobase + REG_DAC); */
outw(val, dev->iobase + REG_DAC);
@@ -746,13 +732,6 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
printk("iobase=0x%lx\n", dev->iobase);
- /*** make it a little quieter, exw, 8/29/06
- for (i = 0; i < S526_NUM_PORTS; i++) {
- printk("0x%02x: 0x%04x\n", dev->iobase + s526_ports[i],
- inw(dev->iobase + s526_ports[i]));
- }
- ***/
-
dev->board_name = board->name;
ret = alloc_private(dev, sizeof(*devpriv));