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

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

staging: comedi: usbduxsigma: tidy up receive_dux_commands()



Rename the variable used for the private data pointer.

Remove dev_err() when usb_blk_msg() fails, it's just added noise.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 502f9a3f
Loading
Loading
Loading
Loading
+16 −19
Original line number Diff line number Diff line
@@ -740,32 +740,29 @@ static int send_dux_commands(struct usbduxsigma_private *devpriv,
			    &nsent, BULK_TIMEOUT);
}

static int receive_dux_commands(struct usbduxsigma_private *this_usbduxsub,
static int receive_dux_commands(struct usbduxsigma_private *devpriv,
				int command)
{
	int result = (-EFAULT);
	int nrec;
	int ret;
	int i;

	for (i = 0; i < RETRIES; i++) {
		result = usb_bulk_msg(this_usbduxsub->usbdev,
				      usb_rcvbulkpipe(this_usbduxsub->usbdev,
		ret = usb_bulk_msg(devpriv->usbdev,
				   usb_rcvbulkpipe(devpriv->usbdev,
						   COMMAND_IN_EP),
				      this_usbduxsub->insnBuffer, SIZEINSNBUF,
				   devpriv->insnBuffer, SIZEINSNBUF,
				   &nrec, BULK_TIMEOUT);
		if (result < 0) {
			dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
				"insn: USB error %d "
				"while receiving DUX command"
				"\n", this_usbduxsub->comedidev->minor,
				result);
			return result;
		}
		if (this_usbduxsub->insnBuffer[0] == command)
			return result;
		if (ret < 0)
			return ret;

		if (devpriv->insnBuffer[0] == command)
			return 0;
	}
	/* this is only reached if the data has been requested a couple of
	 * times */
	/*
	 * This is only reached if the data has been requested a
	 * couple of times and the command was not received.
	 */
	return -EFAULT;
}