From e0f6de37d63faa88ba2ad7e7b046c7fa359a0656 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 6 Oct 2015 17:23:35 -0700 Subject: [PATCH] staging: comedi: me_daq: tidy up digital i/o port register defines For aesthetics, add a _REG suffix to these defines. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/me_daq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 9db6add043af..3acd0d4dc69a 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -81,8 +81,8 @@ #define ME_STATUS_ADFIFO_EMPTY BIT(2) #define ME_STATUS_CHANLIST_FULL BIT(1) #define ME_STATUS_FST_ACTIVE BIT(0) -#define ME_DIO_PORT_A 0x0006 /* R | W */ -#define ME_DIO_PORT_B 0x0008 /* R | W */ +#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 */ @@ -216,8 +216,8 @@ static int me_dio_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - void __iomem *mmio_porta = dev->mmio + ME_DIO_PORT_A; - void __iomem *mmio_portb = dev->mmio + ME_DIO_PORT_B; + void __iomem *mmio_porta = dev->mmio + ME_DIO_PORT_A_REG; + void __iomem *mmio_portb = dev->mmio + ME_DIO_PORT_B_REG; unsigned int mask; unsigned int val; -- 2.39.5