diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 14:59:20 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:12 +0200 |
| commit | af5102a77e6ef0d40611f5255faf3cd860180c29 (patch) | |
| tree | 5cd33951e62e5422ab6974e7f7899c9cb4f7a39c | |
| parent | staging: comedi: ni_stc.h: tidy up AI_Trigger_Select_Register and bits (diff) | |
staging: comedi: ni_stc.h: tidy up AI_DIV_Load_A_Register
Rename the CamelCase.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 880c50f8ec92..ba1c991408d3 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -359,7 +359,7 @@ static const struct mio_regmap m_series_stc_write_regmap[] = { [NISTC_ATRIG_ETC_REG] = { 0x17a, 2 }, [NISTC_AI_START_STOP_REG] = { 0x17c, 2 }, [NISTC_AI_TRIG_SEL_REG] = { 0x17e, 2 }, - [AI_DIV_Load_A_Register] = { 0x180, 4 }, + [NISTC_AI_DIV_LOADA_REG] = { 0x180, 4 }, [AO_Start_Select_Register] = { 0x184, 2 }, [AO_Trigger_Select_Register] = { 0x186, 2 }, [G_Autoincrement_Register(0)] = { 0x188, 2 }, diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 709c8bd5c9f6..4b4cc9fd88f4 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -336,6 +336,8 @@ #define NISTC_AI_TRIG_START1_EDGE BIT(5) #define NISTC_AI_TRIG_START1_SEL(x) (((x) & 0x1f) << 0) +#define NISTC_AI_DIV_LOADA_REG 64 + #define AI_Status_1_Register 2 #define Interrupt_A_St 0x8000 #define AI_FIFO_Full_St 0x4000 @@ -394,8 +396,6 @@ enum Joint_Status_2_Bits { #define AO_BC_Save_Registers 18 #define AO_UC_Save_Registers 20 -#define AI_DIV_Load_A_Register 64 - #define AO_Start_Select_Register 66 #define AO_UI2_Software_Gate _bit15 #define AO_UI2_External_Gate_Polarity _bit14 |