openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: cb_pcidas64: remove 'volatile' from private data 

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-07-16 11:22:46 -07:00 committed by Greg Kroah-Hartman
parent 931a9c7325
commit 0f99981a6d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/comedi/drivers/cb_pcidas64.c
View File

@ -1069,7 +1069,7 @@ struct pcidas64_private {
uint32_t local0_iobase;
uint32_t local1_iobase;
/* number of analog input samples remaining */
volatile unsigned int ai_count;
unsigned int ai_count;
/* dma buffers for analog input */
uint16_t *ai_buffer[MAX_AI_DMA_RING_COUNT];
/* physical addresses of ai dma buffers */
@ -1081,7 +1081,7 @@ struct pcidas64_private {
dma_addr_t ai_dma_desc_bus_addr;
/* index of the ai dma descriptor/buffer
* that is currently being used */
volatile unsigned int ai_dma_index;
unsigned int ai_dma_index;
/* dma buffers for analog output */
uint16_t *ao_buffer[AO_DMA_RING_COUNT];
/* physical addresses of ao dma buffers */
@ -1089,35 +1089,35 @@ struct pcidas64_private {
struct plx_dma_desc *ao_dma_desc;
dma_addr_t ao_dma_desc_bus_addr;
/* keeps track of buffer where the next ao sample should go */
volatile unsigned int ao_dma_index;
unsigned int ao_dma_index;
/* number of analog output samples remaining */
volatile unsigned long ao_count;
unsigned long ao_count;
/* remember what the analog outputs are set to, to allow readback */
volatile unsigned int ao_value[2];
unsigned int ao_value[2];
unsigned int hw_revision; /* stc chip hardware revision number */
/* last bits sent to INTR_ENABLE_REG register */
volatile unsigned int intr_enable_bits;
unsigned int intr_enable_bits;
/* last bits sent to ADC_CONTROL1_REG register */
volatile uint16_t adc_control1_bits;
uint16_t adc_control1_bits;
/* last bits sent to FIFO_SIZE_REG register */
volatile uint16_t fifo_size_bits;
uint16_t fifo_size_bits;
/* last bits sent to HW_CONFIG_REG register */
volatile uint16_t hw_config_bits;
volatile uint16_t dac_control1_bits;
uint16_t hw_config_bits;
uint16_t dac_control1_bits;
/* last bits written to plx9080 control register */
volatile uint32_t plx_control_bits;
uint32_t plx_control_bits;
/* last bits written to plx interrupt control and status register */
volatile uint32_t plx_intcsr_bits;
uint32_t plx_intcsr_bits;
/* index of calibration source readable through ai ch0 */
volatile int calibration_source;
int calibration_source;
/* bits written to i2c calibration/range register */
volatile uint8_t i2c_cal_range_bits;
uint8_t i2c_cal_range_bits;
/* configure digital triggers to trigger on falling edge */
volatile unsigned int ext_trig_falling;
unsigned int ext_trig_falling;
/* states of various devices stored to enable read-back */
unsigned int ad8402_state[2];
unsigned int caldac_state[8];
volatile short ai_cmd_running;
short ai_cmd_running;
unsigned int ai_fifo_segment_length;
struct ext_clock_info ext_clock;
unsigned short ao_bounce_buffer[DAC_FIFO_SIZE];