diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-21 22:22:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-27 00:40:00 +0100 |
| commit | 0f35abd5edaea253ab73e77c26d3393f589f4ae1 (patch) | |
| tree | 9be6fc445f23beb0adce455f8e1949337615746a /drivers | |
| parent | staging: comedi: adv_pci1723: use comedi_subdevice readback for 'ao_data' (diff) | |
| download | linux-0f35abd5edaea253ab73e77c26d3393f589f4ae1.tar.xz linux-0f35abd5edaea253ab73e77c26d3393f589f4ae1.zip | |
staging: comedi: adv_pci1723: tidy up pci1723_dio_insn_config()
For aesthetics, tidy this function up and use the register defines
to remove the magic numbers.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: 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/adv_pci1723.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c index a03f4bc7f4fb..53f2b2158594 100644 --- a/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/drivers/staging/comedi/drivers/adv_pci1723.c @@ -103,33 +103,24 @@ static int pci1723_ao_insn_write(struct comedi_device *dev, return insn->n; } -/* - digital i/o config/query -*/ static int pci1723_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, + unsigned int *data) { unsigned int chan = CR_CHAN(insn->chanspec); - unsigned int mask; - unsigned short mode; + unsigned int mask = (chan < 8) ? 0x00ff : 0xff00; + unsigned short mode = 0x0000; /* assume output */ int ret; - if (chan < 8) - mask = 0x00ff; - else - mask = 0xff00; - ret = comedi_dio_insn_config(dev, s, insn, data, mask); if (ret) return ret; - /* update hardware DIO mode */ - mode = 0x0000; /* assume output */ if (!(s->io_bits & 0x00ff)) - mode |= 0x0001; /* low byte input */ + mode |= PCI1723_DIO_CTRL_LDIO; /* low byte input */ if (!(s->io_bits & 0xff00)) - mode |= 0x0002; /* high byte input */ + mode |= PCI1723_DIO_CTRL_HDIO; /* high byte input */ outw(mode, dev->iobase + PCI1723_DIO_CTRL_REG); return insn->n; |