From: Johan Hovold <johan@kernel.org>
Date: Thu, 18 Mar 2021 16:01:42 +0000 (+0100)
Subject: net: cdc_ncm: drop redundant driver-data assignment
X-Git-Tag: v5.13-rc1~94^2~486
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=269aa0301224dc001676322c0305b0d02c93b7bb;p=thirdparty%2Fkernel%2Flinux.git

net: cdc_ncm: drop redundant driver-data assignment

The driver data for the data interface has already been set by
usb_driver_claim_interface() so drop the subsequent redundant
assignment.

Note that this also avoids setting the driver data three times in case
of a combined interface.

Signed-off-by: Johan Hovold <johan@kernel.org>
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 8acf301154282..8ae565a801b52 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -920,7 +920,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 		goto error2;
 	}
 
-	usb_set_intfdata(ctx->data, dev);
 	usb_set_intfdata(ctx->control, dev);
 
 	if (ctx->ether_desc) {