Commit b02530f5 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: mf6x4: rename the digital input register defines

For aesthetics, rename these defines to clarify them a bit.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
 drivers/staging/comedi/drivers/mf6x4.c | 8 ++++----
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 418c9713
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#define MF6X4_ADDATA_REG 0x00 #define MF6X4_ADDATA_REG 0x00
#define MF6X4_ADCTRL_REG 0x00 #define MF6X4_ADCTRL_REG 0x00
#define MF6X4_ADCTRL_CHAN(x) BIT(chan) #define MF6X4_ADCTRL_CHAN(x) BIT(chan)
#define MF6X4_DIN_R 0x10 #define MF6X4_DIN_REG 0x10
#define MF6X4_DIN_M 0xff #define MF6X4_DIN_MASK 0xff
#define MF6X4_DOUT_REG 0x10 #define MF6X4_DOUT_REG 0x10
#define MF6X4_ADSTART_R 0x20 #define MF6X4_ADSTART_R 0x20
#define MF6X4_DAC_R(x) (0x20 + ((x) * 2)) #define MF6X4_DAC_R(x) (0x20 + ((x) * 2))
...@@ -95,7 +95,7 @@ static int mf6x4_di_insn_bits(struct comedi_device *dev, ...@@ -95,7 +95,7 @@ static int mf6x4_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) 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; return insn->n;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment