diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-19 22:12:33 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-21 16:19:44 (GMT) |
commit | 5c813bb100431eff1f78d75682ae1fe2d30744b4 (patch) | |
tree | 98e1f8de0bd6e1115fc70d45ed5e3bbfda45d5dc /drivers/staging/comedi | |
parent | 5a5614cb669f9f99bb3e983b3c4987a1eaef852b (diff) | |
download | linux-fsl-qoriq-5c813bb100431eff1f78d75682ae1fe2d30744b4.tar.xz |
staging: comedi: s526: cleanup s526_gpct_winsn()
Use a local variable for the iobase of the channel being written.
This makes the outw() calls a bit cleaner.
Rearrange the switch () so that the actual write to the device
can be common regardless of the gpct configuration.
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/staging/comedi')
-rw-r--r-- | drivers/staging/comedi/drivers/s526.c | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index 66741b6..7782061 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c @@ -381,27 +381,18 @@ static int s526_gpct_insn_config(struct comedi_device *dev, } static int s526_gpct_winsn(struct comedi_device *dev, - struct comedi_subdevice *s, struct comedi_insn *insn, + struct comedi_subdevice *s, + struct comedi_insn *insn, unsigned int *data) { struct s526_private *devpriv = dev->private; unsigned int chan = CR_CHAN(insn->chanspec); - short value; - union cmReg cmReg; + unsigned long chan_iobase = dev->iobase + chan * 8; + + inw(chan_iobase + REG_C0M); /* Is this read required? */ - cmReg.value = inw(dev->iobase + REG_C0M + chan * 8); /* Check what Application of Counter this channel is configured for */ switch (devpriv->s526_gpct_config[chan].app) { - case PositionMeasurement: - outw(0xFFFF & ((*data) >> 16), dev->iobase + REG_C0H + chan * 8); - outw(0xFFFF & (*data), dev->iobase + REG_C0L + chan * 8); - break; - - case SinglePulseGeneration: - outw(0xFFFF & ((*data) >> 16), dev->iobase + REG_C0H + chan * 8); - outw(0xFFFF & (*data), dev->iobase + REG_C0L + chan * 8); - break; - case PulseTrainGeneration: /* data[0] contains the PULSE_WIDTH data[1] contains the PULSE_PERIOD @@ -410,22 +401,24 @@ static int s526_gpct_winsn(struct comedi_device *dev, pulse frequency on the selected source */ if ((data[1] > data[0]) && (data[0] > 0)) { - (devpriv->s526_gpct_config[chan]).data[0] = data[0]; - (devpriv->s526_gpct_config[chan]).data[1] = data[1]; + devpriv->s526_gpct_config[chan].data[0] = data[0]; + devpriv->s526_gpct_config[chan].data[1] = data[1]; } else { return -EINVAL; } - value = (short)((*data >> 16) & 0xFFFF); - outw(value, dev->iobase + REG_C0H + chan * 8); - value = (short)(*data & 0xFFFF); - outw(value, dev->iobase + REG_C0L + chan * 8); + /* Fall thru to write the PULSE_WIDTH */ + + case PositionMeasurement: + case SinglePulseGeneration: + outw((data[0] >> 16) & 0xffff, chan_iobase + REG_C0H); + outw(data[0] & 0xffff, chan_iobase + REG_C0L); break; - default: /* Impossible */ + + default: return -EINVAL; - break; } - /* return the number of samples written */ + return insn->n; } |