From: H Hartley Sweeten Date: Fri, 1 May 2015 21:59:49 +0000 (-0700) Subject: staging: comedi: ni_stc.h: tidy up AI_*_Save_Registers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=549835c76a3ab053c4450d23d9c11ae43290196d;p=linux-beck.git staging: comedi: ni_stc.h: tidy up AI_*_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 17646a2f55b2..8dda682fca10 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -426,8 +426,8 @@ static const struct mio_regmap m_series_stc_read_regmap[] = { [NISTC_STATUS1_REG] = { 0x136, 2 }, [NISTC_DIO_SERIAL_IN_REG] = { 0x009, 1 }, [NISTC_STATUS2_REG] = { 0x13a, 2 }, - [AI_SI_Save_Registers] = { 0x180, 4 }, - [AI_SC_Save_Registers] = { 0x184, 4 }, + [NISTC_AI_SI_SAVE_REG] = { 0x180, 4 }, + [NISTC_AI_SC_SAVE_REG] = { 0x184, 4 }, }; static unsigned int m_series_stc_read(struct comedi_device *dev, diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index cd4cf98fbd04..da4495112e16 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -558,8 +558,8 @@ #define NISTC_STATUS2_REG 29 #define NISTC_STATUS2_AO_TMRDACWRS_IN_PROGRESS BIT(5) -#define AI_SI_Save_Registers 64 -#define AI_SC_Save_Registers 66 +#define NISTC_AI_SI_SAVE_REG 64 +#define NISTC_AI_SC_SAVE_REG 66 /* command register */ #define G_Disarm_Copy _bit15 /* strobe */