Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4a75b21 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8518a52c

drivers/staging/comedi/drivers/vmk80xx.c

+20 −26
Original line number Diff line number Diff line
@@ -551,20 +551,14 @@ 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);



	switch (data[0]) {

	case INSN_CONFIG_RESET:

		if (devpriv->model == VMK8055_MODEL) {

			if (!chan) {

				cmd = VMK8055_CMD_RST_CNT1;
@@ -573,19 +567,19 @@ static int vmk80xx_cnt_insn_config(struct comedi_device *dev, 
				cmd = VMK8055_CMD_RST_CNT2;

				reg = VMK8055_CNT2_REG;

			}



			devpriv->usb_tx_buf[reg] = 0x00;

		} else {

			cmd = VMK8061_CMD_RST_CNT;

		}



	for (n = 0; n < insn->n; n++)

		if (vmk80xx_write_packet(dev, cmd))

		ret = vmk80xx_write_packet(dev, cmd);

		break;



	default:

		ret = -EINVAL;

		break;

	}

	up(&devpriv->limit_sem);



	return n;

	return ret ? ret : insn->n;

}



static int vmk80xx_cnt_insn_write(struct comedi_device *dev,