diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-26 23:43:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 00:12:55 +0100 |
| commit | e920fad281e9d5168f8d10a5ced11c719b05233a (patch) | |
| tree | 87c090791caf6c8d685da615113c88f3ab41ae26 | |
| parent | staging: comedi: s626: remove the uint16_t casts of the bit values (diff) | |
| download | linux-e920fad281e9d5168f8d10a5ced11c719b05233a.tar.xz linux-e920fad281e9d5168f8d10a5ced11c719b05233a.zip | |
staging: comedi: s626: cleanup s626_dio_insn_config()
Add some local variables to make this function a bit cleaner.
The comedi core expects this function to return the number of
data parameters used. Change the return from '1' to insn->n to
make this more aparent.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index b03088b4726f..9d1e6edefd95 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -1687,23 +1687,23 @@ static int s626_dio_insn_bits(struct comedi_device *dev, static int s626_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 long group = (unsigned long)s->private; + unsigned int chan = CR_CHAN(insn->chanspec); + unsigned int mask = 1 << chan; switch (data[0]) { case INSN_CONFIG_DIO_QUERY: - data[1] = - (s-> - io_bits & (1 << CR_CHAN(insn->chanspec))) ? COMEDI_OUTPUT : - COMEDI_INPUT; + data[1] = (s->io_bits & mask) ? COMEDI_OUTPUT : COMEDI_INPUT; return insn->n; break; case COMEDI_INPUT: - s->io_bits &= ~(1 << CR_CHAN(insn->chanspec)); + s->io_bits &= ~mask; break; case COMEDI_OUTPUT: - s->io_bits |= 1 << CR_CHAN(insn->chanspec); + s->io_bits |= mask; break; default: return -EINVAL; @@ -1711,7 +1711,7 @@ static int s626_dio_insn_config(struct comedi_device *dev, } DEBIwrite(dev, LP_WRDOUT(group), s->io_bits); - return 1; + return insn->n; } /* Now this function initializes the value of the counter (data[0]) |