Commit 19e02434 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: mf6x4: rename remaining BAR1 register defines 



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

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
 drivers/staging/comedi/drivers/mf6x4.c | 16 ++++++++--------
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b02530f5

drivers/staging/comedi/drivers/mf6x4.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE