forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: mf6x4: rename remaining BAR1 register defines

Browse source 
For consistency, rename the ADSTART and DAC register defines to add
a bit of clarity.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
 drivers/staging/comedi/drivers/mf6x4.c | 16 ++++++++--------
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2015-10-06 11:11:14 -07:00 • committed by Greg Kroah-Hartman
commit 19e0243471
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/comedi/drivers/mf6x4.c
View file

@ -44,8 +44,8 @@
#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))
#define MF6X4_ADSTART_REG 0x20
#define MF6X4_DAC_REG(x) (0x20 + ((x) * 2))
/* BAR2 registers */
#define MF634_GPIOC_R 0x68
@ -142,7 +142,7 @@ static int mf6x4_ai_insn_read(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) {
/* Trigger ADC conversion by reading ADSTART */
ioread16(dev->mmio + MF6X4_ADSTART_R);
ioread16(dev->mmio + MF6X4_ADSTART_REG);
ret = comedi_timeout(dev, s, insn, mf6x4_ai_eoc, 0);
if (ret)
@ -178,7 +178,7 @@ static int mf6x4_ao_insn_write(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) {
val = data[i];
iowrite16(val, dev->mmio + MF6X4_DAC_R(chan));
iowrite16(val, dev->mmio + MF6X4_DAC_REG(chan));
}
s->readback[chan] = val;