Skip to content

Commit

Permalink
Staging: comedi: fix brace coding style issue in daqboard2000.c
Browse files Browse the repository at this point in the history
This is a patch to the daqboard2000.c file that fixes up a brace
warning found by the checkpatch.pl tool.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 9, 2011
1 parent c501816 commit 5f1d0f3
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/staging/comedi/drivers/daqboard2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -429,16 +429,14 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
/* Enable reading from the scanlist FIFO */
fpga->acqControl = DAQBOARD2000_SeqStartScanList;
for (timeout = 0; timeout < 20; timeout++) {
if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull) {
if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull)
break;
}
/* udelay(2); */
}
fpga->acqControl = DAQBOARD2000_AdcPacerEnable;
for (timeout = 0; timeout < 20; timeout++) {
if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning) {
if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning)
break;
}
/* udelay(2); */
}
for (timeout = 0; timeout < 20; timeout++) {
Expand All @@ -464,9 +462,8 @@ static int daqboard2000_ao_insn_read(struct comedi_device *dev,
int i;
int chan = CR_CHAN(insn->chanspec);

for (i = 0; i < insn->n; i++) {
for (i = 0; i < insn->n; i++)
data[i] = devpriv->ao_readback[chan];
}

return i;
}
Expand All @@ -489,9 +486,8 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
/* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */
fpga->dacSetting[chan] = data[i];
for (timeout = 0; timeout < 20; timeout++) {
if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0) {
if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0)
break;
}
/* udelay(2); */
}
devpriv->ao_readback[chan] = data[i];
Expand Down Expand Up @@ -604,9 +600,8 @@ static int initialize_daqboard2000(struct comedi_device *dev,
for (; i < len; i += 2) {
int data =
(cpld_array[i] << 8) + cpld_array[i + 1];
if (!daqboard2000_writeCPLD(dev, data)) {
if (!daqboard2000_writeCPLD(dev, data))
break;
}
}
if (i >= len) {
#ifdef DEBUG_EEPROM
Expand Down

0 comments on commit 5f1d0f3

Please sign in to comment.