diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-10 18:53:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-10 20:02:23 -0700 |
| commit | dc79022aefaba02ab85edf7df70cd35164888523 (patch) | |
| tree | 2bb14d0a37ecde081a8c4b453e7d8f5819c68625 /drivers | |
| parent | 83dcfee0f2b29e689f79f259bde1c1dc34772b13 (diff) | |
staging: comedi: adl_pci9111: remove pci9111_ao_set_data macro
This macro relies on a local variable having a specific name.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9111.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 477aa2ba0f82..7d1737a8b65c 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -119,7 +119,7 @@ TODO: #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 @@ TODO: &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]; } |