[PATCH 28/36] staging: comedi: cb_pcidas: remove 'volatile' on private data variables

[PATCH 28/36] staging: comedi: cb_pcidas: remove 'volatile' on private data variables

[H Hartley Sweeten]

As indicated by checkpatch.pl, "WARNING: Use of volatile is usually
wrong: ...". The variables in the private data that are marked
volatile don't need to be. Remove the volatile.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/cb_pcidas.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 95ce546..eba39b4 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -357,16 +357,16 @@ struct cb_pcidas_private {
 	/*  divisors of master clock for analog input pacing */
 	unsigned int divisor1;
 	unsigned int divisor2;
-	volatile unsigned int count;	/*  number of analog input samples remaining */
-	volatile unsigned int adc_fifo_bits;	/*  bits to write to interrupt/adcfifo register */
-	volatile unsigned int s5933_intcsr_bits;	/*  bits to write to amcc s5933 interrupt control/status register */
-	volatile unsigned int ao_control_bits;	/*  bits to write to ao control and status register */
+	unsigned int count;	/*  number of analog input samples remaining */
+	unsigned int adc_fifo_bits;	/*  bits to write to interrupt/adcfifo register */
+	unsigned int s5933_intcsr_bits;	/*  bits to write to amcc s5933 interrupt control/status register */
+	unsigned int ao_control_bits;	/*  bits to write to ao control and status register */
 	short ai_buffer[AI_BUFFER_SIZE];
 	short ao_buffer[AO_BUFFER_SIZE];
 	/*  divisors of master clock for analog output pacing */
 	unsigned int ao_divisor1;
 	unsigned int ao_divisor2;
-	volatile unsigned int ao_count;	/*  number of analog output samples remaining */
+	unsigned int ao_count;	/*  number of analog output samples remaining */
 	int ao_value[2];	/*  remember what the analog outputs are set to, to allow readback */
 	unsigned int caldac_value[NUM_CHANNELS_8800];	/*  for readback of caldac */
 	unsigned int trimpot_value[NUM_CHANNELS_8402];	/*  for readback of trimpot */
-- 
1.7.11

Re: [PATCH 28/36] staging: comedi: cb_pcidas: remove 'volatile' on private data variables

[Ian Abbott]

On 2012-06-27 02:06, H Hartley Sweeten wrote:
> As indicated by checkpatch.pl, "WARNING: Use of volatile is usually
> wrong: ...". The variables in the private data that are marked
> volatile don't need to be. Remove the volatile.

Yes, looks good!

Reviewed-by: Ian Abbott <abbbotti@mev.co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-