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

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

staging: comedi: usbdux: remove 'ao_chanlist' from private data 



This member of the private data is just a copy of the channels from
the cmd->chanlist. Remove the member and just use the cmd->chanlist
directly.

Remove the unneeded 'len' local variable in usbdux_ao_isoc_irq().
This is just the cmd->chanlist_len.

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 1b81dbc2

drivers/staging/comedi/drivers/usbdux.c

+3 −10
Original line number Original line Diff line number Diff line
@@ -202,7 +202,6 @@ struct usbdux_private { 
	/* input buffer for single insn */

	/* input buffer for single insn */

	uint16_t *insn_buf;

	uint16_t *insn_buf;





	uint8_t ao_chanlist[USBDUX_NUM_AO_CHAN];

	unsigned int ao_readback[USBDUX_NUM_AO_CHAN];

	unsigned int ao_readback[USBDUX_NUM_AO_CHAN];





	unsigned int high_speed:1;

	unsigned int high_speed:1;
@@ -415,7 +414,6 @@ static void usbduxsub_ao_isoc_irq(struct urb *urb) 
	struct usbdux_private *devpriv = dev->private;

	struct usbdux_private *devpriv = dev->private;

	struct comedi_cmd *cmd = &s->async->cmd;

	struct comedi_cmd *cmd = &s->async->cmd;

	uint8_t *datap;

	uint8_t *datap;

	int len;

	int ret;

	int ret;

	int i;

	int i;
@@ -478,10 +476,9 @@ static void usbduxsub_ao_isoc_irq(struct urb *urb) 




		/* transmit data to the USB bus */

		/* transmit data to the USB bus */

		datap = urb->transfer_buffer;

		datap = urb->transfer_buffer;

		len = s->async->cmd.chanlist_len;

		*datap++ = cmd->chanlist_len;

		*datap++ = len;

		for (i = 0; i < cmd->chanlist_len; i++) {

		for (i = 0; i < s->async->cmd.chanlist_len; i++) {

			unsigned int chan = CR_CHAN(cmd->chanlist[i]);

			unsigned int chan = devpriv->ao_chanlist[i];

			unsigned short val;

			unsigned short val;





			ret = comedi_buf_get(s, &val);

			ret = comedi_buf_get(s, &val);
@@ -1030,7 +1027,6 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	struct usbdux_private *devpriv = dev->private;

	struct usbdux_private *devpriv = dev->private;

	struct comedi_cmd *cmd = &s->async->cmd;

	struct comedi_cmd *cmd = &s->async->cmd;

	int ret = -EBUSY;

	int ret = -EBUSY;

	int i;





	down(&devpriv->sem);

	down(&devpriv->sem);
@@ -1040,9 +1036,6 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
	/* set current channel of the running acquisition to zero */

	/* set current channel of the running acquisition to zero */

	s->async->cur_chan = 0;

	s->async->cur_chan = 0;





	for (i = 0; i < cmd->chanlist_len; ++i)

		devpriv->ao_chanlist[i] = CR_CHAN(cmd->chanlist[i]);



	/* we count in steps of 1ms (125us) */

	/* we count in steps of 1ms (125us) */

	/* 125us mode not used yet */

	/* 125us mode not used yet */

	if (0) {		/* (devpriv->high_speed) */

	if (0) {		/* (devpriv->high_speed) */