Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: usbdux: tidy up usbduxsub_submit_inurbs()

Browse source 
Pass the comedi_device pointer (the urb context) to this function
instead of the private data pointer.

Use a local variable for the urb pointers that are setup and submitted.

Remove the sanity check of the private data. This function can only
get called if the allocation was successful during the attach.

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-07-24 14:12:35 -07:00 committed by Greg Kroah-Hartman
parent 91aa6b2193
commit 865d9eedd1
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/staging/comedi/drivers/usbdux.c
View file

@ -698,24 +698,27 @@ static int usbdux_firmware_upload(struct comedi_device *dev,
return ret;
}
static int usbduxsub_submit_inurbs(struct usbdux_private *usbduxsub)
static int usbduxsub_submit_inurbs(struct comedi_device *dev)
{
int i, err_flag;
if (!usbduxsub)
return -EFAULT;
struct usbdux_private *devpriv = dev->private;
struct urb *urb;
int ret;
int i;
/* Submit all URBs and start the transfer on the bus */
for (i = 0; i < usbduxsub->num_in_buffers; i++) {
for (i = 0; i < devpriv->num_in_buffers; i++) {
urb = devpriv->urb_in[i];
/* in case of a resubmission after an unlink... */
usbduxsub->urb_in[i]->interval = usbduxsub->ai_interval;
usbduxsub->urb_in[i]->context = usbduxsub->comedidev;
usbduxsub->urb_in[i]->dev = usbduxsub->usbdev;
usbduxsub->urb_in[i]->status = 0;
usbduxsub->urb_in[i]->transfer_flags = URB_ISO_ASAP;
err_flag = usb_submit_urb(usbduxsub->urb_in[i], GFP_ATOMIC);
if (err_flag)
return err_flag;
urb->interval = devpriv->ai_interval;
urb->context = dev;
urb->dev = devpriv->usbdev;
urb->status = 0;
urb->transfer_flags = URB_ISO_ASAP;
ret = usb_submit_urb(urb, GFP_ATOMIC);
if (ret)
return ret;
}
return 0;
}
@ -899,7 +902,7 @@ static int usbdux_ai_inttrig(struct comedi_device *dev,
}
if (!(this_usbduxsub->ai_cmd_running)) {
this_usbduxsub->ai_cmd_running = 1;
ret = usbduxsub_submit_inurbs(this_usbduxsub);
ret = usbduxsub_submit_inurbs(dev);
if (ret < 0) {
this_usbduxsub->ai_cmd_running = 0;
up(&this_usbduxsub->sem);
@ -986,7 +989,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
if (cmd->start_src == TRIG_NOW) {
/* enable this acquisition operation */
this_usbduxsub->ai_cmd_running = 1;
ret = usbduxsub_submit_inurbs(this_usbduxsub);
ret = usbduxsub_submit_inurbs(dev);
if (ret < 0) {
this_usbduxsub->ai_cmd_running = 0;
/* fixme: unlink here?? */