diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-10-06 21:11:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-13 08:55:31 +0300 |
| commit | b02530f5549a40e2e02dc33157f406d706e1bfa1 (patch) | |
| tree | 75118308e0830679c4442d88d491e523e4def65c /drivers | |
| parent | 418c971364cb6eb3cc94b9e4ec1ae6bf3fc98dc7 (diff) | |
| download | linux-b02530f5549a40e2e02dc33157f406d706e1bfa1.tar.xz | |
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 <hsweeten@visionengravers.com>
drivers/staging/comedi/drivers/mf6x4.c | 8 ++++----
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/mf6x4.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |