Commit 101e490a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adl_pci9111: remove pci9111_d[io]_* i/o macros

These macros rely 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 9d093151
...@@ -121,7 +121,7 @@ a multiple of chanlist_len*convert_arg. ...@@ -121,7 +121,7 @@ a multiple of chanlist_len*convert_arg.
#define PCI9111_REGISTER_AD_FIFO_VALUE 0x00 /* AD Data stored #define PCI9111_REGISTER_AD_FIFO_VALUE 0x00 /* AD Data stored
in FIFO */ in FIFO */
#define PCI9111_REGISTER_DA_OUTPUT 0x00 #define PCI9111_REGISTER_DA_OUTPUT 0x00
#define PCI9111_REGISTER_DIGITAL_IO 0x02 #define PCI9111_DIO_REG 0x02
#define PCI9111_REGISTER_EXTENDED_IO_PORTS 0x04 #define PCI9111_REGISTER_EXTENDED_IO_PORTS 0x04
#define PCI9111_REGISTER_AD_CHANNEL_CONTROL 0x06 /* Channel #define PCI9111_REGISTER_AD_CHANNEL_CONTROL 0x06 /* Channel
selection */ selection */
...@@ -234,11 +234,6 @@ a multiple of chanlist_len*convert_arg. ...@@ -234,11 +234,6 @@ a multiple of chanlist_len*convert_arg.
outw(data&PCI9111_AO_RESOLUTION_MASK, \ outw(data&PCI9111_AO_RESOLUTION_MASK, \
dev->iobase + PCI9111_REGISTER_DA_OUTPUT) dev->iobase + PCI9111_REGISTER_DA_OUTPUT)
#define pci9111_di_get_bits() \
inw(dev->iobase + PCI9111_REGISTER_DIGITAL_IO)
#define pci9111_do_set_bits(bits) \
outw(bits, dev->iobase + PCI9111_REGISTER_DIGITAL_IO)
static const struct comedi_lrange pci9111_hr_ai_range = { static const struct comedi_lrange pci9111_hr_ai_range = {
5, 5,
...@@ -1095,7 +1090,7 @@ static int pci9111_di_insn_bits(struct comedi_device *dev, ...@@ -1095,7 +1090,7 @@ static int pci9111_di_insn_bits(struct comedi_device *dev,
{ {
unsigned int bits; unsigned int bits;
bits = pci9111_di_get_bits(); bits = inw(dev->iobase + PCI9111_DIO_REG);
data[1] = bits; data[1] = bits;
return insn->n; return insn->n;
...@@ -1120,7 +1115,7 @@ static int pci9111_do_insn_bits(struct comedi_device *dev, ...@@ -1120,7 +1115,7 @@ static int pci9111_do_insn_bits(struct comedi_device *dev,
bits |= data[0] & data[1]; bits |= data[0] & data[1];
s->state = bits; s->state = bits;
pci9111_do_set_bits(bits); outw(bits, dev->iobase + PCI9111_DIO_REG);
data[1] = bits; data[1] = bits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment