Commit da58c263 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: usbduxfast: rename 'urbIn' in private data

Rename the CamelCase variable 'urbIn' in the private data to
simply 'urb'.
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 a4f2e0f9
...@@ -148,7 +148,7 @@ static const struct comedi_lrange range_usbduxfast_ai_range = { ...@@ -148,7 +148,7 @@ static const struct comedi_lrange range_usbduxfast_ai_range = {
* one sub device just now: A/D * one sub device just now: A/D
*/ */
struct usbduxfast_private { struct usbduxfast_private {
struct urb *urbIn; /* BULK-transfer handling: urb */ struct urb *urb; /* BULK-transfer handling: urb */
int8_t *transfer_buffer; int8_t *transfer_buffer;
int16_t *insnBuffer; /* input buffer for single insn */ int16_t *insnBuffer; /* input buffer for single insn */
short int ai_cmd_running; /* asynchronous command is running */ short int ai_cmd_running; /* asynchronous command is running */
...@@ -195,10 +195,10 @@ static int usbduxfastsub_unlink_InURBs(struct comedi_device *dev) ...@@ -195,10 +195,10 @@ static int usbduxfastsub_unlink_InURBs(struct comedi_device *dev)
int j = 0; int j = 0;
int err = 0; int err = 0;
if (devpriv && devpriv->urbIn) { if (devpriv && devpriv->urb) {
devpriv->ai_cmd_running = 0; devpriv->ai_cmd_running = 0;
/* waits until a running transfer is over */ /* waits until a running transfer is over */
usb_kill_urb(devpriv->urbIn); usb_kill_urb(devpriv->urb);
j = 0; j = 0;
} }
return err; return err;
...@@ -455,11 +455,11 @@ static int usbduxfastsub_submit_InURBs(struct comedi_device *dev) ...@@ -455,11 +455,11 @@ static int usbduxfastsub_submit_InURBs(struct comedi_device *dev)
if (!devpriv) if (!devpriv)
return -EFAULT; return -EFAULT;
usb_fill_bulk_urb(devpriv->urbIn, usb, usb_rcvbulkpipe(usb, BULKINEP), usb_fill_bulk_urb(devpriv->urb, usb, usb_rcvbulkpipe(usb, BULKINEP),
devpriv->transfer_buffer, SIZEINBUF, devpriv->transfer_buffer, SIZEINBUF,
usbduxfast_ai_interrupt, dev); usbduxfast_ai_interrupt, dev);
ret = usb_submit_urb(devpriv->urbIn, GFP_ATOMIC); ret = usb_submit_urb(devpriv->urb, GFP_ATOMIC);
if (ret) { if (ret) {
dev_err(dev->class_dev, "usb_submit_urb error %d\n", ret); dev_err(dev->class_dev, "usb_submit_urb error %d\n", ret);
return ret; return ret;
...@@ -1297,8 +1297,8 @@ static int usbduxfast_auto_attach(struct comedi_device *dev, ...@@ -1297,8 +1297,8 @@ static int usbduxfast_auto_attach(struct comedi_device *dev,
return -ENODEV; return -ENODEV;
} }
devpriv->urbIn = usb_alloc_urb(0, GFP_KERNEL); devpriv->urb = usb_alloc_urb(0, GFP_KERNEL);
if (!devpriv->urbIn) { if (!devpriv->urb) {
dev_err(dev->class_dev, "Could not alloc. urb\n"); dev_err(dev->class_dev, "Could not alloc. urb\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -1333,15 +1333,15 @@ static void usbduxfast_detach(struct comedi_device *dev) ...@@ -1333,15 +1333,15 @@ static void usbduxfast_detach(struct comedi_device *dev)
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
if (devpriv->urbIn) { if (devpriv->urb) {
/* waits until a running transfer is over */ /* waits until a running transfer is over */
usb_kill_urb(devpriv->urbIn); usb_kill_urb(devpriv->urb);
kfree(devpriv->transfer_buffer); kfree(devpriv->transfer_buffer);
devpriv->transfer_buffer = NULL; devpriv->transfer_buffer = NULL;
usb_free_urb(devpriv->urbIn); usb_free_urb(devpriv->urb);
devpriv->urbIn = NULL; devpriv->urb = NULL;
} }
kfree(devpriv->insnBuffer); kfree(devpriv->insnBuffer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment