diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-07-29 13:56:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-31 17:37:49 -0700 |
| commit | 6f63840447030b32662d8d425b36e8fabd7799cf (patch) | |
| tree | 28aa57e3179cc47771e895b74a0aed27e4bf3cb2 /drivers | |
| parent | 66eca8575525a725a105aec5ca3a5cfa57ecd524 (diff) | |
staging: comedi: das16: remove 'volatile' on private data variables
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>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/das16.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index d86ed2cce7c0..95261a617623 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -351,8 +351,8 @@ static inline int timer_period(void) struct das16_private_struct { unsigned int clockbase; /* master clock speed in ns */ - volatile unsigned int control_state; /* dma, interrupt and trigger control bits */ - volatile unsigned long adc_byte_count; /* number of bytes remaining */ + unsigned int control_state; /* dma, interrupt and trigger control bits */ + unsigned long adc_byte_count; /* number of bytes remaining */ /* divisor dividing master clock to get conversion frequency */ unsigned int divisor1; /* divisor dividing master clock to get conversion frequency */ @@ -361,7 +361,7 @@ struct das16_private_struct { uint16_t *dma_buffer[2]; dma_addr_t dma_buffer_addr[2]; unsigned int current_buffer; - volatile unsigned int dma_transfer_size; /* target number of bytes to transfer per dma shot */ + unsigned int dma_transfer_size; /* target number of bytes to transfer per dma shot */ /** * user-defined analog input and output ranges * defined from config options @@ -370,7 +370,7 @@ struct das16_private_struct { struct comedi_lrange *user_ao_range_table; struct timer_list timer; /* for timed interrupt */ - volatile short timer_running; + short timer_running; unsigned long extra_iobase; }; |