aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRavishankar karkala Mallikarjunayya <ravishankar.km@greenturtles.in>2011-12-08 07:51:57 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-08 19:04:25 -0500
commit5f1d0f3f3f9ca3dbcbe1b251dccd8bfc6df18057 (patch)
treebf8a06635e3ee5486f82f13e62c06dea8378dd3a /drivers
parentc5018168a59b92ec3bd0f7b598e6d0d64d507e1e (diff)
Staging: comedi: fix brace coding style issue in daqboard2000.c
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/daqboard2000.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 9958bd5044c5..a16060eff915 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -429,16 +429,14 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
429 /* Enable reading from the scanlist FIFO */ 429 /* Enable reading from the scanlist FIFO */
430 fpga->acqControl = DAQBOARD2000_SeqStartScanList; 430 fpga->acqControl = DAQBOARD2000_SeqStartScanList;
431 for (timeout = 0; timeout < 20; timeout++) { 431 for (timeout = 0; timeout < 20; timeout++) {
432 if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull) { 432 if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull)
433 break; 433 break;
434 }
435 /* udelay(2); */ 434 /* udelay(2); */
436 } 435 }
437 fpga->acqControl = DAQBOARD2000_AdcPacerEnable; 436 fpga->acqControl = DAQBOARD2000_AdcPacerEnable;
438 for (timeout = 0; timeout < 20; timeout++) { 437 for (timeout = 0; timeout < 20; timeout++) {
439 if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning) { 438 if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning)
440 break; 439 break;
441 }
442 /* udelay(2); */ 440 /* udelay(2); */
443 } 441 }
444 for (timeout = 0; timeout < 20; timeout++) { 442 for (timeout = 0; timeout < 20; timeout++) {
@@ -464,9 +462,8 @@ static int daqboard2000_ao_insn_read(struct comedi_device *dev,
464 int i; 462 int i;
465 int chan = CR_CHAN(insn->chanspec); 463 int chan = CR_CHAN(insn->chanspec);
466 464
467 for (i = 0; i < insn->n; i++) { 465 for (i = 0; i < insn->n; i++)
468 data[i] = devpriv->ao_readback[chan]; 466 data[i] = devpriv->ao_readback[chan];
469 }
470 467
471 return i; 468 return i;
472} 469}
@@ -489,9 +486,8 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
489 /* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */ 486 /* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */
490 fpga->dacSetting[chan] = data[i]; 487 fpga->dacSetting[chan] = data[i];
491 for (timeout = 0; timeout < 20; timeout++) { 488 for (timeout = 0; timeout < 20; timeout++) {
492 if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0) { 489 if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0)
493 break; 490 break;
494 }
495 /* udelay(2); */ 491 /* udelay(2); */
496 } 492 }
497 devpriv->ao_readback[chan] = data[i]; 493 devpriv->ao_readback[chan] = data[i];
@@ -604,9 +600,8 @@ static int initialize_daqboard2000(struct comedi_device *dev,
604 for (; i < len; i += 2) { 600 for (; i < len; i += 2) {
605 int data = 601 int data =
606 (cpld_array[i] << 8) + cpld_array[i + 1]; 602 (cpld_array[i] << 8) + cpld_array[i + 1];
607 if (!daqboard2000_writeCPLD(dev, data)) { 603 if (!daqboard2000_writeCPLD(dev, data))
608 break; 604 break;
609 }
610 } 605 }
611 if (i >= len) { 606 if (i >= len) {
612#ifdef DEBUG_EEPROM 607#ifdef DEBUG_EEPROM