lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: ni_atmio16d: brace fixes

Browse Source 
Fix improper use of braces in drivers/staging/comedi/drivers/ni_atmio16d.c

Signed-off-by: Bruce Jones <brucej@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bruce Jones
2009-09-24 15:01:35 -07:00
committed by Greg Kroah-Hartman
parent 2c146810e3
commit 988da29c48
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/ni_atmio16d.c
View File

@@ -586,9 +586,8 @@ static int atmio16d_ai_insn_read(struct comedi_device *dev,
/* read the data now */ /* read the data now */
data[i] = inw(dev->iobase + AD_FIFO_REG); data[i] = inw(dev->iobase + AD_FIFO_REG);
/* change to two's complement if need be */ /* change to two's complement if need be */
if (devpriv->adc_coding == adc_2comp) { if (devpriv->adc_coding == adc_2comp)
data[i] ^= 0x800; data[i] ^= 0x800;
}
break; break;
} }
if (status & STAT_AD_OVERFLOW) { if (status & STAT_AD_OVERFLOW) {
@@ -618,10 +617,8 @@ static int atmio16d_ao_insn_read(struct comedi_device *dev,
printk("atmio16d_ao_insn_read\n"); printk("atmio16d_ao_insn_read\n");
#endif #endif
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++)
data[i] = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; data[i] = devpriv->ao_readback[CR_CHAN(insn->chanspec)];
}
return i; return i;
} }
@@ -642,15 +639,13 @@ static int atmio16d_ao_insn_write(struct comedi_device *dev,
d = data[i]; d = data[i];
switch (chan) { switch (chan) {
case 0: case 0:
if (devpriv->dac0_coding == dac_2comp) { if (devpriv->dac0_coding == dac_2comp)
d ^= 0x800; d ^= 0x800;
}
outw(d, dev->iobase + DAC0_REG); outw(d, dev->iobase + DAC0_REG);
break; break;
case 1: case 1:
if (devpriv->dac1_coding == dac_2comp) { if (devpriv->dac1_coding == dac_2comp)
d ^= 0x800; d ^= 0x800;
}
outw(d, dev->iobase + DAC1_REG); outw(d, dev->iobase + DAC1_REG);
break; break;
default: default:
@@ -855,11 +850,10 @@ static int atmio16d_attach(struct comedi_device *dev,
/* 8255 subdevice */ /* 8255 subdevice */
s++; s++;
if (boardtype->has_8255) { if (boardtype->has_8255)
subdev_8255_init(dev, s, NULL, dev->iobase); subdev_8255_init(dev, s, NULL, dev->iobase);
} else { else
s->type = COMEDI_SUBD_UNUSED; s->type = COMEDI_SUBD_UNUSED;
}
/* don't yet know how to deal with counter/timers */ /* don't yet know how to deal with counter/timers */
#if 0 #if 0