]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: usbduxfast: remove 'ifnum' from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 14 May 2013 20:32:53 +0000 (13:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2013 23:24:23 +0000 (16:24 -0700)
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>
drivers/staging/comedi/drivers/usbduxfast.c

index 59bbd4d94a2b24c1409e3a146442c0934b20e2c7..b51bd97dd53bd29d90d4c771949ced71c9f38d8b 100644 (file)
@@ -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");