diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-22 00:22:14 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-25 11:59:14 (GMT) |
| commit | a4a75b21014bfb4ab977e461e17d2c759472f84b (patch) | |
| tree | 13bad7ca90ad006e97260233b8c5605359e923a8 /drivers/staging/comedi | |
| parent | 8518a52c4456c697033bf81f0df73c026200ad8e (diff) | |
| download | linux-a4a75b21014bfb4ab977e461e17d2c759472f84b.tar.xz | |
staging: comedi: vmk80xx: tidy up vmk80xx_cnt_insn_config()
Tidy up this (*insn_config) function to follow the normal format in
comedi drivers.
INSN_CONFIG_RESET instructions do not have any extra parameters (insn->n is
always 1) so the for loop used to write the packet doesn't make any sense.
Remove it and just write the single packet.
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/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/vmk80xx.c | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c index d200ad5..eb76460 100644 --- a/drivers/staging/comedi/drivers/vmk80xx.c +++ b/drivers/staging/comedi/drivers/vmk80xx.c @@ -551,41 +551,35 @@ static int vmk80xx_cnt_insn_config(struct comedi_device *dev, unsigned int *data) { struct vmk80xx_private *devpriv = dev->private; - unsigned int insn_cmd; - int chan; + unsigned int chan = CR_CHAN(insn->chanspec); int cmd; int reg; - int n; - - insn_cmd = data[0]; - if (insn_cmd != INSN_CONFIG_RESET) - return -EINVAL; + int ret; down(&devpriv->limit_sem); - - chan = CR_CHAN(insn->chanspec); - - if (devpriv->model == VMK8055_MODEL) { - if (!chan) { - cmd = VMK8055_CMD_RST_CNT1; - reg = VMK8055_CNT1_REG; + switch (data[0]) { + case INSN_CONFIG_RESET: + if (devpriv->model == VMK8055_MODEL) { + if (!chan) { + cmd = VMK8055_CMD_RST_CNT1; + reg = VMK8055_CNT1_REG; + } else { + cmd = VMK8055_CMD_RST_CNT2; + reg = VMK8055_CNT2_REG; + } + devpriv->usb_tx_buf[reg] = 0x00; } else { - cmd = VMK8055_CMD_RST_CNT2; - reg = VMK8055_CNT2_REG; + cmd = VMK8061_CMD_RST_CNT; } - - devpriv->usb_tx_buf[reg] = 0x00; - } else { - cmd = VMK8061_CMD_RST_CNT; + ret = vmk80xx_write_packet(dev, cmd); + break; + default: + ret = -EINVAL; + break; } - - for (n = 0; n < insn->n; n++) - if (vmk80xx_write_packet(dev, cmd)) - break; - up(&devpriv->limit_sem); - return n; + return ret ? ret : insn->n; } static int vmk80xx_cnt_insn_write(struct comedi_device *dev, |