mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
net: cdc_ncm: remove redundant "intf" field
This is always a duplicate of the "control" field. It causes confusion wrt intf_data updates and cleanups. Cc: Alexey Orishko <alexey.orishko@gmail.com> Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f6701d5f73
commit
3e515665a7
2 changed files with 1 additions and 4 deletions
|
@ -382,7 +382,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
|
|||
len = intf->cur_altsetting->extralen;
|
||||
|
||||
ctx->udev = dev->udev;
|
||||
ctx->intf = intf;
|
||||
|
||||
/* parse through descriptors associated with control interface */
|
||||
while ((len > 0) && (buf[0] > 2) && (buf[0] <= len)) {
|
||||
|
@ -489,7 +488,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
|
|||
|
||||
usb_set_intfdata(ctx->data, dev);
|
||||
usb_set_intfdata(ctx->control, dev);
|
||||
usb_set_intfdata(ctx->intf, dev);
|
||||
|
||||
if (ctx->ether_desc) {
|
||||
temp = usbnet_get_ethernet_addr(dev, ctx->ether_desc->iMACAddress);
|
||||
|
@ -562,7 +560,7 @@ void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf)
|
|||
ctx->control = NULL;
|
||||
}
|
||||
|
||||
usb_set_intfdata(ctx->intf, NULL);
|
||||
usb_set_intfdata(intf, NULL);
|
||||
cdc_ncm_free(ctx);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cdc_ncm_unbind);
|
||||
|
|
|
@ -103,7 +103,6 @@ struct cdc_ncm_ctx {
|
|||
struct usb_host_endpoint *in_ep;
|
||||
struct usb_host_endpoint *out_ep;
|
||||
struct usb_host_endpoint *status_ep;
|
||||
struct usb_interface *intf;
|
||||
struct usb_interface *control;
|
||||
struct usb_interface *data;
|
||||
|
||||
|
|
Loading…
Reference in a new issue