From: John Sheehan Date: Fri, 18 Jun 2010 17:39:15 +0000 (+0100) Subject: Staging: comedi: fix code warnings in s626.c X-Git-Tag: v2.6.36-rc1~520^2~1^2~348 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae6eb75c63bcc21ffdb8c617a09d35b4a4ef11fe;p=profile%2Fivi%2Fkernel-x86-ivi.git Staging: comedi: fix code warnings in s626.c 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index b78d7ad..d5ba3ab 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -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 @@ -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. */ } @@ -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]; */ @@ -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 */ @@ -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) @@ -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. */ @@ -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; @@ -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 -------------------- */ @@ -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, @@ -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, @@ -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) @@ -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. */ @@ -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; * } */