openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-05-23 12:50:51 -07:00 committed by Greg Kroah-Hartman
parent 502f9a3f76
commit 125a77fcf5
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/staging/comedi/drivers/usbduxsigma.c
View File

@ -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 (ret < 0)
return ret;
if (devpriv->insnBuffer[0] == command)
return 0;
}
if (this_usbduxsub->insnBuffer[0] == command)
return result;
}
/* 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;
}