netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Bjørn Mork" <bjorn@mork.no>
To: netdev@vger.kernel.org
Cc: linux-usb@vger.kernel.org,
	"Alexey Orishko" <alexey.orishko@gmail.com>,
	"Bjørn Mork" <bjorn@mork.no>
Subject: [PATCH net-next 10/24] net: cdc_ncm: remove descriptor pointers
Date: Fri,  1 Nov 2013 11:16:47 +0100	[thread overview]
Message-ID: <1383301021-16613-11-git-send-email-bjorn@mork.no> (raw)
In-Reply-To: <1383301021-16613-1-git-send-email-bjorn@mork.no>

header_desc was completely unused and union_desc was never used
outside cdc_ncm_bind_common.

Cc: Alexey Orishko <alexey.orishko@gmail.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 drivers/net/usb/cdc_ncm.c   |   12 ++++++------
 include/linux/usb/cdc_ncm.h |    4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index b8de8dd..435fcc7 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -372,6 +372,7 @@ static const struct ethtool_ops cdc_ncm_ethtool_ops = {
 
 int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_altsetting)
 {
+	const struct usb_cdc_union_desc *union_desc = NULL;
 	struct cdc_ncm_ctx *ctx;
 	struct usb_driver *driver;
 	u8 *buf;
@@ -406,16 +407,15 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 
 		switch (buf[2]) {
 		case USB_CDC_UNION_TYPE:
-			if (buf[0] < sizeof(*(ctx->union_desc)))
+			if (buf[0] < sizeof(*union_desc))
 				break;
 
-			ctx->union_desc =
-					(const struct usb_cdc_union_desc *)buf;
+			union_desc = (const struct usb_cdc_union_desc *)buf;
 
 			ctx->control = usb_ifnum_to_if(dev->udev,
-					ctx->union_desc->bMasterInterface0);
+						       union_desc->bMasterInterface0);
 			ctx->data = usb_ifnum_to_if(dev->udev,
-					ctx->union_desc->bSlaveInterface0);
+						    union_desc->bSlaveInterface0);
 			break;
 
 		case USB_CDC_ETHERNET_TYPE:
@@ -458,7 +458,7 @@ advance:
 	}
 
 	/* some buggy devices have an IAD but no CDC Union */
-	if (!ctx->union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {
+	if (!union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {
 		ctx->control = intf;
 		ctx->data = usb_ifnum_to_if(dev->udev, intf->cur_altsetting->desc.bInterfaceNumber + 1);
 		dev_dbg(&intf->dev, "CDC Union missing - got slave from IAD\n");
diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
index 89b52a0..cad54ad 100644
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
@@ -92,9 +92,7 @@ struct cdc_ncm_ctx {
 	struct tasklet_struct bh;
 
 	const struct usb_cdc_ncm_desc *func_desc;
-	const struct usb_cdc_mbim_desc   *mbim_desc;
-	const struct usb_cdc_header_desc *header_desc;
-	const struct usb_cdc_union_desc *union_desc;
+	const struct usb_cdc_mbim_desc *mbim_desc;
 	const struct usb_cdc_ether_desc *ether_desc;
 
 	struct usb_interface *control;
-- 
1.7.10.4

  parent reply	other threads:[~2013-11-01 10:17 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-01 10:16 [PATCH net-next 00/24] cdc_ncm: many small and mostly trivial fixes Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 01/24] net: cdc_ncm: simplify and optimize frame padding Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 02/24] net: cdc_ncm: add include protection to cdc_ncm.h Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 03/24] net: cdc_ncm: remove redundant "intf" field Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 04/24] net: cdc_ncm: remove redundant endpoint pointers Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 07/24] net: cdc_ncm: remove tx_speed and rx_speed fields Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 08/24] net: cdc_ncm: remove ncm_parm field Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 09/24] net: cdc_ncm: fix SET_MAX_DATAGRAM_SIZE Bjørn Mork
2013-11-01 10:16 ` Bjørn Mork [this message]
2013-11-01 10:16 ` [PATCH net-next 11/24] net: cdc_ncm: only the control intf can be probed Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 12/24] net: cdc_ncm: no point in filling up the NTBs if we send ZLPs Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 13/24] net: cdc_ncm: remove probe and disconnect wrappers Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 15/24] net: cdc_ncm: set correct dev->hard_mtu Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 17/24] net: cdc_ncm: use netif_* and dev_* instead of pr_* Bjørn Mork
2013-11-01 10:36   ` Joe Perches
2013-11-04  8:59     ` Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 21/24] net: cdc_ncm: refactoring cdc_ncm_setup Bjørn Mork
2013-11-01 10:16 ` [PATCH net-next 22/24] net: cdc_ncm: return proper error if setup fails Bjørn Mork
     [not found] ` <1383301021-16613-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>
2013-11-01 10:16   ` [PATCH net-next 05/24] net: cdc_ncm: remove redundant netdev field Bjørn Mork
2013-11-01 10:16   ` [PATCH net-next 06/24] net: cdc_ncm: remove unused udev field Bjørn Mork
2013-11-01 10:16   ` [PATCH net-next 14/24] net: cdc_ncm: remove ethtool ops Bjørn Mork
2013-11-01 10:16   ` [PATCH net-next 16/24] net: cdc_ncm: log the length we warn about Bjørn Mork
2013-11-01 10:16   ` [PATCH net-next 18/24] net: cdc_ncm: log signatures in hex Bjørn Mork
2013-11-01 10:16   ` [PATCH net-next 19/24] net: cdc_ncm: endian convert constants instead of variables Bjørn Mork
2013-11-01 10:16   ` [PATCH net-next 20/24] net: cdc_ncm: drop "extern" from header declarations Bjørn Mork
2013-11-01 10:17   ` [PATCH net-next 23/24] net: cdc_ncm: improve bind error debug messages Bjørn Mork
2013-11-01 10:17 ` [PATCH net-next 24/24] net: cdc_ncm: no not set tx_max higher than the device supports Bjørn Mork
2013-11-02  6:02 ` [PATCH net-next 00/24] cdc_ncm: many small and mostly trivial fixes David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383301021-16613-11-git-send-email-bjorn@mork.no \
    --to=bjorn@mork.no \
    --cc=alexey.orishko@gmail.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).