summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/comedidev.h
diff options
context:
space:
mode:
authorLijo Antony <lijo.kernel@gmail.com>2013-01-01 22:41:06 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 14:34:49 -0800
commit21f181f16cea4a4cbaea25409ddb044a4ad5cd34 (patch)
tree31d3e20b14eb27111ad350f1609ffb84cd9fe5a8 /drivers/staging/comedi/comedidev.h
parent90a35c15c5d7d5c6254772d2752975dda185710c (diff)
Staging: comedi: comedidev.h: fixed a camel case
Fixed a camel case issue. Signed-off-by: Lijo Antony <lijo.kernel@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/comedidev.h')
-rw-r--r--drivers/staging/comedi/comedidev.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 259996483c66..34a85d3941c3 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -464,7 +464,7 @@ static inline unsigned comedi_buf_read_n_allocated(struct comedi_async *async)
static inline void *comedi_aux_data(int options[], int n)
{
unsigned long address;
- unsigned long addressLow;
+ unsigned long address_low;
int bit_shift;
if (sizeof(int) >= sizeof(void *))
address = options[COMEDI_DEVCONF_AUX_DATA_LO];
@@ -472,9 +472,9 @@ static inline void *comedi_aux_data(int options[], int n)
address = options[COMEDI_DEVCONF_AUX_DATA_HI];
bit_shift = sizeof(int) * 8;
address <<= bit_shift;
- addressLow = options[COMEDI_DEVCONF_AUX_DATA_LO];
- addressLow &= (1UL << bit_shift) - 1;
- address |= addressLow;
+ address_low = options[COMEDI_DEVCONF_AUX_DATA_LO];
+ address_low &= (1UL << bit_shift) - 1;
+ address |= address_low;
}
if (n >= 1)
address += options[COMEDI_DEVCONF_AUX_DATA0_LENGTH];