staging: comedi: me_daq: tidy up counter registers

For aesthetics, convert the counter registers into macros that take
the counter channel and return the correct register offset.

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>

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 6b3abe3de780c565d3c1b8d19549528c4c8a03e8..91104050a203787f190b8d6a744496953144951b 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -95,12 +95,9 @@
 #define   ME_DAC_CTRL_MASK(x)          (ME_DAC_CTRL_BIPOLAR(x) |       \
                                         ME_DAC_CTRL_GAIN(x))
 #define ME_AO_DATA_REG(x)              (0x14 + ((x) * 2))      /* - | W */
-#define ME_COUNTER_ENDDATA_A           0x001C  /* - | W */
-#define ME_COUNTER_ENDDATA_B           0x001E  /* - | W */
-#define ME_COUNTER_STARTDATA_A         0x0020  /* - | W */
-#define ME_COUNTER_VALUE_A             0x0020  /* R | - */
-#define ME_COUNTER_STARTDATA_B         0x0022  /* - | W */
-#define ME_COUNTER_VALUE_B             0x0022  /* R | - */
+#define ME_COUNTER_ENDDATA_REG(x)      (0x1c + ((x) * 2))      /* - | W */
+#define ME_COUNTER_STARTDATA_REG(x)    (0x20 + ((x) * 2))      /* - | W */
+#define ME_COUNTER_VALUE_REG(x)                (0x20 + ((x) * 2))      /* R | - */
 
 static const struct comedi_lrange me_ai_range = {
        8, {