Skip to content

Commit

Permalink
Staging: comedi: fix code warnings in s626.c
Browse files Browse the repository at this point in the history
A patch for s626.c to fix some of the warnings
reported by the checkpatch.pl tool, namely,
-suspect code indent for conditional statements
-please, no space before tabs

Signed-off-by: John Sheehan <john.d.sheehan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
John Sheehan authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent add7459 commit ae6eb75
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions drivers/staging/comedi/drivers/s626.c
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
MC_ENABLE(P_MC2, MC2_UPLD_IIC);
/* Invoke command upload */
while ((RR7146(P_MC2) & MC2_UPLD_IIC) == 0)
;
;
/* and wait for upload to complete. */

/* Per SAA7146 data sheet, write to STATUS reg twice to
Expand All @@ -826,7 +826,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* Write I2C control: reset error flags. */
MC_ENABLE(P_MC2, MC2_UPLD_IIC); /* Invoke command upload */
while (!MC_TEST(P_MC2, MC2_UPLD_IIC))
;
;
/* and wait for upload to complete. */
}

Expand Down Expand Up @@ -866,14 +866,14 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* not start up in a defined state after a PCI reset.
*/

/* PollList = EOPL; // Create a simple polling */
/* // list for analog input */
/* // channel 0. */
/* PollList = EOPL; // Create a simple polling */
/* // list for analog input */
/* // channel 0. */
/* ResetADC( dev, &PollList ); */

/* s626_ai_rinsn(dev,dev->subdevices,NULL,data); //( &AdcData ); // */
/* //Get initial ADC */
/* //value. */
/* //Get initial ADC */
/* //value. */

/* StartVal = data[0]; */

Expand All @@ -886,10 +886,10 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)

/* for ( index = 0; index < 500; index++ ) */
/* { */
/* s626_ai_rinsn(dev,dev->subdevices,NULL,data); */
/* AdcData = data[0]; //ReadADC( &AdcData ); */
/* if ( AdcData != StartVal ) */
/* break; */
/* s626_ai_rinsn(dev,dev->subdevices,NULL,data); */
/* AdcData = data[0]; //ReadADC( &AdcData ); */
/* if ( AdcData != StartVal ) */
/* break; */
/* } */

/* end initADC */
Expand Down Expand Up @@ -1690,7 +1690,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,

/* Wait for ADC done. */
while (!(RR7146(P_PSR) & PSR_GPIO2))
;
;

/* Fetch ADC data. */
if (n != 0)
Expand Down Expand Up @@ -1723,7 +1723,7 @@ static int s626_ai_insn_read(struct comedi_device *dev,

/* Wait for ADC done. */
while (!(RR7146(P_PSR) & PSR_GPIO2))
;
;

/* Fetch ADC data from audio interface's input shift register. */

Expand Down Expand Up @@ -2564,11 +2564,11 @@ static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val)

MC_ENABLE(P_MC2, MC2_UPLD_IIC);
while (!MC_TEST(P_MC2, MC2_UPLD_IIC))
;
;

/* Wait until I2C bus transfer is finished or an error occurs. */
while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY)
;
;

/* Return non-zero if I2C error occured. */
return RR7146(P_I2CCTRL) & I2C_ERR;
Expand Down Expand Up @@ -2683,7 +2683,7 @@ static void SendDAC(struct comedi_device *dev, uint32_t val)
* cleared when the transfer has finished.
*/
while ((RR7146(P_MC1) & MC1_A2OUT) != 0)
;
;

/* START THE OUTPUT STREAM TO THE TARGET DAC -------------------- */

Expand All @@ -2701,7 +2701,7 @@ static void SendDAC(struct comedi_device *dev, uint32_t val)
* to the output buffer register.
*/
while ((RR7146(P_SSR) & SSR_AF2_OUT) == 0)
;
;

/* Set up to trap execution at slot 0 when the TSL sequencer cycles
* back to slot 0 after executing the EOS in slot 5. Also,
Expand Down Expand Up @@ -2738,7 +2738,7 @@ static void SendDAC(struct comedi_device *dev, uint32_t val)
* out/in on SD2 the 0x00 that is always referenced by slot 5.
*/
while ((RR7146(P_FB_BUFFER2) & 0xFF000000) != 0)
;
;
}
/* Either (1) we were too late setting the slot 0 trap; the TSL
* sequencer restarted slot 0 before we could set the EOS trap flag,
Expand All @@ -2755,7 +2755,7 @@ static void SendDAC(struct comedi_device *dev, uint32_t val)
* from 0x00 to 0xFF.
*/
while ((RR7146(P_FB_BUFFER2) & 0xFF000000) == 0)
;
;
}

static void WriteMISC2(struct comedi_device *dev, uint16_t NewImage)
Expand Down Expand Up @@ -2795,11 +2795,11 @@ static void DEBItransfer(struct comedi_device *dev)
/* Wait for completion of upload from shadow RAM to DEBI control */
/* register. */
while (!MC_TEST(P_MC2, MC2_UPLD_DEBI))
;
;

/* Wait until DEBI transfer is done. */
while (RR7146(P_PSR) & PSR_DEBI_S)
;
;
}

/* Write a value to a gate array register. */
Expand Down Expand Up @@ -3157,7 +3157,7 @@ static void SetLatchSource(struct comedi_device *dev, struct enc_private *k,
/*
* static uint16_t GetLatchSource(struct comedi_device *dev, struct enc_private *k )
* {
* return ( DEBIread( dev, k->MyCRB) >> CRBBIT_LATCHSRC ) & 3;
* return ( DEBIread( dev, k->MyCRB) >> CRBBIT_LATCHSRC ) & 3;
* }
*/

Expand Down

0 comments on commit ae6eb75

Please sign in to comment.