summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-22 09:40:58 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 11:39:21 -0700
commit8263dfdfb9669083cf528d4ec3d90bf471fa5505 (patch)
treefbe1a8280b70b4909b0bdc37ba504d90632e22f7
parentf2c447caf64fb13b111c151c92eae8115933539e (diff)
staging: comedi: ni_labpc: 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> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h
index 6be3a11a6ade..03280936c8a9 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.h
+++ b/drivers/staging/comedi/drivers/ni_labpc.h
@@ -56,19 +56,19 @@ struct labpc_boardinfo {
struct labpc_private {
struct mite_struct *mite; /* for mite chip on pci-1200 */
/* number of data points left to be taken */
- volatile unsigned long long count;
+ unsigned long long count;
/* software copy of analog output values */
unsigned int ao_value[NUM_AO_CHAN];
/* software copys of bits written to command registers */
- volatile unsigned int command1_bits;
- volatile unsigned int command2_bits;
- volatile unsigned int command3_bits;
- volatile unsigned int command4_bits;
- volatile unsigned int command5_bits;
- volatile unsigned int command6_bits;
+ unsigned int command1_bits;
+ unsigned int command2_bits;
+ unsigned int command3_bits;
+ unsigned int command4_bits;
+ unsigned int command5_bits;
+ unsigned int command6_bits;
/* store last read of board status registers */
- volatile unsigned int status1_bits;
- volatile unsigned int status2_bits;
+ unsigned int status1_bits;
+ unsigned int status2_bits;
/*
* value to load into board's counter a0 (conversion pacing) for timed
* conversions