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>

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 38566bffca980507b5bc5331f3508cedd60f3d11..bfab8796730f36af3ae1c9c4ed12b81fec192592 100644 (file)
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -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 @@ advance:
 
        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);

diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
index 89f0bbc2cf83ba1f12b7432c742bda6dfde23702..c14e00fb166773fd711d06790d31db965f31108a 100644 (file)
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
@@ -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;