USB: cdc-wdm: kill the now unnecessary bMaxPacketSize0 field and udev variable

We don't need bMaxPacketSize0, and keeping all these different size fields
around will only cause us to use the wrong one.

Seems the udev variable was only used for getting bMaxPacketSize0.  We
could have used it for the usb_fill_*_urb() calls, but as it wasn't
before - why start now?  Instead make the interface_to_usbdev()
calls consistent.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 8909058b1bb1f5af4e85357a4fa6dd92e82ca8ca..bb8208a13a534324bb51c884b788906b120702da 100644 (file)
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -80,7 +80,6 @@ struct wdm_device {
        u16                     bufsize;
        u16                     wMaxCommand;
        u16                     wMaxPacketSize;
-       u16                     bMaxPacketSize0;
        __le16                  inum;
        int                     reslength;
        int                     length;
@@ -597,7 +596,6 @@ static void wdm_rxwork(struct work_struct *work)
 static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
        int rv = -EINVAL;
-       struct usb_device *udev = interface_to_usbdev(intf);
        struct wdm_device *desc;
        struct usb_host_interface *iface;
        struct usb_endpoint_descriptor *ep;
@@ -657,7 +655,6 @@ next_desc:
                goto err;
 
        desc->wMaxPacketSize = usb_endpoint_maxp(ep);
-       desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
 
        desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
        if (!desc->orq)
@@ -709,7 +706,7 @@ next_desc:
 
        usb_fill_control_urb(
                desc->response,
-               interface_to_usbdev(desc->intf),
+               interface_to_usbdev(intf),
                /* using common endpoint 0 */
                usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0),
                (unsigned char *)desc->irq,