From faf58f60a4b0e93a5b7f74b74a80aa01089d3f38 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 6 Oct 2015 17:23:36 -0700 Subject: [PATCH] staging: comedi: me_daq: tidy up timer data register defines For aesthetics, convert the register defines into a macro that takes the timer channel and returns the correct register offset. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/me_daq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 3acd0d4dc69a..25f5a2a40d68 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -83,9 +83,7 @@ #define ME_STATUS_FST_ACTIVE BIT(0) #define ME_DIO_PORT_A_REG 0x06 /* R | W */ #define ME_DIO_PORT_B_REG 0x08 /* R | W */ -#define ME_TIMER_DATA_0 0x000A /* - | W */ -#define ME_TIMER_DATA_1 0x000C /* - | W */ -#define ME_TIMER_DATA_2 0x000E /* - | W */ +#define ME_TIMER_DATA_REG(x) (0x0a + ((x) * 2)) /* - | W */ #define ME_CHANNEL_LIST 0x0010 /* - | W */ #define ADC_UNIPOLAR (1<<6) #define ADC_GAIN_0 (0<<4) -- 2.30.2