From: H Hartley Sweeten Date: Fri, 1 May 2015 21:59:45 +0000 (-0700) Subject: staging: comedi: ni_stc.h: tidy up AO_*_Save_Registers X-Git-Tag: v4.2-rc1~88^2~681 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c090acdc981421765becba929d9581511bdbbd0;p=karo-tx-linux.git staging: comedi: ni_stc.h: tidy up AO_*_Save_Registers Rename the CamelCase. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 9cd796ce1832..b194d1558463 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -420,9 +420,9 @@ static const struct mio_regmap m_series_stc_read_regmap[] = { [NISTC_G1_HW_SAVE_REG] = { 0x114, 4 }, [NISTC_G0_SAVE_REG] = { 0x118, 4 }, [NISTC_G1_SAVE_REG] = { 0x11c, 4 }, - [AO_UI_Save_Registers] = { 0x120, 4 }, - [AO_BC_Save_Registers] = { 0x124, 4 }, - [AO_UC_Save_Registers] = { 0x128, 4 }, + [NISTC_AO_UI_SAVE_REG] = { 0x120, 4 }, + [NISTC_AO_BC_SAVE_REG] = { 0x124, 4 }, + [NISTC_AO_UC_SAVE_REG] = { 0x128, 4 }, [Joint_Status_1_Register] = { 0x136, 2 }, [DIO_Serial_Input_Register] = { 0x009, 1 }, [Joint_Status_2_Register] = { 0x13a, 2 }, diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index ff577210c23c..af07e4c7f698 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -546,6 +546,10 @@ #define NISTC_G0_SAVE_REG 12 #define NISTC_G1_SAVE_REG 14 +#define NISTC_AO_UI_SAVE_REG 16 +#define NISTC_AO_BC_SAVE_REG 18 +#define NISTC_AO_UC_SAVE_REG 20 + #define AI_SI_Save_Registers 64 #define AI_SC_Save_Registers 66 @@ -558,10 +562,6 @@ enum Joint_Status_2_Bits { AO_TMRDACWRs_In_Progress_St = 0x20, }; -#define AO_UI_Save_Registers 16 -#define AO_BC_Save_Registers 18 -#define AO_UC_Save_Registers 20 - /* command register */ #define G_Disarm_Copy _bit15 /* strobe */ #define G_Save_Trace_Copy _bit14