summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-07-24 21:16:44 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-25 20:15:37 (GMT)
commit903f4fde801343eb95e3f30cab24c50c9fe367c6 (patch)
tree6a8385c5e92b3fec00644ea0aa770fafd2c7189c /drivers
parent0b20d613afd0e1ba394c2b209a5f459c5f43e1ff (diff)
downloadlinux-fsl-qoriq-903f4fde801343eb95e3f30cab24c50c9fe367c6.tar.xz
staging: comedi: usbdux: remove 'ifnum' from the private data
The 'ifnum' is only used during the attach of the device. Remove it from the private data. 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/usbdux.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 8841944..c0c4a27 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -223,8 +223,6 @@ struct usbdux_private {
int16_t *insn_buffer;
/* output buffer for single DA outputs */
int16_t *out_buffer;
- /* interface number */
- int ifnum;
/* is it USB_SPEED_HIGH or not? */
short int high_speed;
/* asynchronous command is running */
@@ -1896,7 +1894,6 @@ static int usbdux_auto_attach(struct comedi_device *dev,
sema_init(&devpriv->sem, 1);
- devpriv->ifnum = intf->altsetting->desc.bInterfaceNumber;
usb_set_intfdata(intf, devpriv);
devpriv->high_speed = (usb->speed == USB_SPEED_HIGH);
@@ -1914,7 +1911,8 @@ static int usbdux_auto_attach(struct comedi_device *dev,
return ret;
/* setting to alternate setting 3: enabling iso ep and bulk ep. */
- ret = usb_set_interface(usb, devpriv->ifnum, 3);
+ ret = usb_set_interface(usb, intf->altsetting->desc.bInterfaceNumber,
+ 3);
if (ret < 0) {
dev_err(dev->class_dev,
"could not set alternate setting 3 in high speed\n");