From 397f7524adc01c85eb084dead3b4b0d64c8e0642 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Sep 2012 18:52:07 -0700 Subject: [PATCH] --- yaml --- r: 325113 b: refs/heads/master c: 101e490a2a2a81f41c9e82acba80a537824aa499 h: refs/heads/master i: 325111: d567afb4d8390b173ffe2d76bae3be0885decd04 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci9111.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index fbbc7b3368dd..c24e1715e780 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d09315113192b127d79b79cc2cf1b2bb52f2337 +refs/heads/master: 101e490a2a2a81f41c9e82acba80a537824aa499 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 2ac81c159f57..3c0b8c1f83dc 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -121,7 +121,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_REGISTER_DIGITAL_IO 0x02 +#define PCI9111_DIO_REG 0x02 #define PCI9111_REGISTER_EXTENDED_IO_PORTS 0x04 #define PCI9111_REGISTER_AD_CHANNEL_CONTROL 0x06 /* Channel selection */ @@ -234,11 +234,6 @@ a multiple of chanlist_len*convert_arg. outw(data&PCI9111_AO_RESOLUTION_MASK, \ 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 = { 5, @@ -1095,7 +1090,7 @@ static int pci9111_di_insn_bits(struct comedi_device *dev, { unsigned int bits; - bits = pci9111_di_get_bits(); + bits = inw(dev->iobase + PCI9111_DIO_REG); data[1] = bits; return insn->n; @@ -1120,7 +1115,7 @@ static int pci9111_do_insn_bits(struct comedi_device *dev, bits |= data[0] & data[1]; s->state = bits; - pci9111_do_set_bits(bits); + outw(bits, dev->iobase + PCI9111_DIO_REG); data[1] = bits;