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

staging: comedi: adl_pci9111: remove pci9111_ao_set_data macro 



This macro relies on a local variable having a specific name.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83dcfee0

drivers/staging/comedi/drivers/adl_pci9111.c

+3 −7
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ a multiple of chanlist_len*convert_arg. 


#define PCI9111_REGISTER_AD_FIFO_VALUE			0x00 /* AD Data stored

								in FIFO */

#define PCI9111_REGISTER_DA_OUTPUT			0x00

#define PCI9111_AO_REG					0x00

#define PCI9111_DIO_REG					0x02

#define PCI9111_REGISTER_EXTENDED_IO_PORTS		0x04

#define PCI9111_REGISTER_AD_CHANNEL_CONTROL		0x06 /* Channel
@@ -229,11 +229,6 @@ a multiple of chanlist_len*convert_arg. 
		&PCI9111_HR_AI_RESOLUTION_MASK) \

			^ PCI9111_HR_AI_RESOLUTION_2_CMP_BIT)



#define pci9111_ao_set_data(data) \

	outw(data&PCI9111_AO_RESOLUTION_MASK, \

		dev->iobase + PCI9111_REGISTER_DA_OUTPUT)





static const struct comedi_lrange pci9111_hr_ai_range = {

	5,

	{
@@ -1055,7 +1050,8 @@ pci9111_ao_insn_write(struct comedi_device *dev, 
	int i;



	for (i = 0; i < insn->n; i++) {

		pci9111_ao_set_data(data[i]);

		outw(data[i] & PCI9111_AO_RESOLUTION_MASK,

			dev->iobase + PCI9111_AO_REG);

		dev_private->ao_readback = data[i];

	}