From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 14 May 2013 20:32:53 +0000 (-0700)
Subject: staging: comedi: usbduxfast: remove 'ifnum' from private data
X-Git-Tag: firefly_0821_release~176^2~5845^2~658
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01245e7a9fa575affb4f42c4309a9c25b2296b08;p=firefly-linux-kernel-4.4.55.git

staging: comedi: usbduxfast: remove 'ifnum' from private data

The interface number is only needed 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>
---

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 59bbd4d94a2b..b51bd97dd53b 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -152,7 +152,6 @@ struct usbduxfast_private {
 	struct urb *urbIn;	/* BULK-transfer handling: urb */
 	int8_t *transfer_buffer;
 	int16_t *insnBuffer;	/* input buffer for single insn */
-	int ifnum;		/* interface number */
 	struct usb_interface *intf;	/* interface structure */
 	/* comedi device for the interrupt context */
 	struct comedi_device *comedidev;
@@ -1285,7 +1284,6 @@ static int usbduxfast_auto_attach(struct comedi_device *dev,
 	devpriv->comedidev = dev;
 	devpriv->usb = usb;
 	devpriv->intf = intf;
-	devpriv->ifnum = intf->altsetting->desc.bInterfaceNumber;
 	usb_set_intfdata(intf, devpriv);
 
 	devpriv->dux_commands = kmalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
@@ -1296,7 +1294,8 @@ static int usbduxfast_auto_attach(struct comedi_device *dev,
 	if (!devpriv->insnBuffer)
 		return -ENOMEM;
 
-	ret = usb_set_interface(devpriv->usb, devpriv->ifnum, 1);
+	ret = usb_set_interface(devpriv->usb,
+				intf->altsetting->desc.bInterfaceNumber, 1);
 	if (ret < 0) {
 		dev_err(&intf->dev,
 			"could not switch to alternate setting 1\n");