From: H Hartley Sweeten Date: Wed, 24 Jul 2013 21:16:44 +0000 (-0700) Subject: staging: comedi: usbdux: remove 'ifnum' from the private data X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=903f4fde801343eb95e3f30cab24c50c9fe367c6;p=linux-beck.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 88419444497f..c0c4a2711664 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");