Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f638404 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66eca857

drivers/staging/comedi/drivers/das16.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

};