Commit 8143a896 authored by Bjørn Mork's avatar Bjørn Mork Committed by Greg Kroah-Hartman

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: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8457d99c
...@@ -80,7 +80,6 @@ struct wdm_device { ...@@ -80,7 +80,6 @@ struct wdm_device {
u16 bufsize; u16 bufsize;
u16 wMaxCommand; u16 wMaxCommand;
u16 wMaxPacketSize; u16 wMaxPacketSize;
u16 bMaxPacketSize0;
__le16 inum; __le16 inum;
int reslength; int reslength;
int length; int length;
...@@ -597,7 +596,6 @@ static void wdm_rxwork(struct work_struct *work) ...@@ -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) static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
{ {
int rv = -EINVAL; int rv = -EINVAL;
struct usb_device *udev = interface_to_usbdev(intf);
struct wdm_device *desc; struct wdm_device *desc;
struct usb_host_interface *iface; struct usb_host_interface *iface;
struct usb_endpoint_descriptor *ep; struct usb_endpoint_descriptor *ep;
...@@ -657,7 +655,6 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) ...@@ -657,7 +655,6 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
goto err; goto err;
desc->wMaxPacketSize = usb_endpoint_maxp(ep); desc->wMaxPacketSize = usb_endpoint_maxp(ep);
desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL); desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
if (!desc->orq) if (!desc->orq)
...@@ -709,7 +706,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) ...@@ -709,7 +706,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
usb_fill_control_urb( usb_fill_control_urb(
desc->response, desc->response,
interface_to_usbdev(desc->intf), interface_to_usbdev(intf),
/* using common endpoint 0 */ /* using common endpoint 0 */
usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0), usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0),
(unsigned char *)desc->irq, (unsigned char *)desc->irq,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment