From: H Hartley Sweeten Date: Tue, 6 Oct 2015 18:11:13 +0000 (-0700) Subject: staging: comedi: mf6x4: rename the digital input register defines X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b02530f5549a40e2e02dc33157f406d706e1bfa1;p=deliverable%2Flinux.git staging: comedi: mf6x4: rename the digital input register defines For aesthetics, rename these defines to clarify them a bit. Signed-off-by: H Hartley Sweeten drivers/staging/comedi/drivers/mf6x4.c | 8 ++++---- Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/mf6x4.c b/drivers/staging/comedi/drivers/mf6x4.c index 03f81e948b95..30dbdf0c91d7 100644 --- a/drivers/staging/comedi/drivers/mf6x4.c +++ b/drivers/staging/comedi/drivers/mf6x4.c @@ -41,8 +41,8 @@ #define MF6X4_ADDATA_REG 0x00 #define MF6X4_ADCTRL_REG 0x00 #define MF6X4_ADCTRL_CHAN(x) BIT(chan) -#define MF6X4_DIN_R 0x10 -#define MF6X4_DIN_M 0xff +#define MF6X4_DIN_REG 0x10 +#define MF6X4_DIN_MASK 0xff #define MF6X4_DOUT_REG 0x10 #define MF6X4_ADSTART_R 0x20 #define MF6X4_DAC_R(x) (0x20 + ((x) * 2)) @@ -95,7 +95,7 @@ static int mf6x4_di_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - data[1] = ioread16(dev->mmio + MF6X4_DIN_R) & MF6X4_DIN_M; + data[1] = ioread16(dev->mmio + MF6X4_DIN_REG) & MF6X4_DIN_MASK; return insn->n; }