Acked-By: Enrico Mioso <mrkiko...@gmail.com>
On Sat, 10 May 2014, Bj?rn Mork wrote:
==Date: Sat, 10 May 2014 17:41:49 +0200
==From: Bj?rn Mork <bj...@mork.no>
==To: net...@vger.kernel.org
==Cc: linux-usb@vger.kernel.org, Alexey Orishko <alexey.oris...@gmail.com>,
== Oliver Neukum <oli...@neukum.org>, Enrico Mioso <mrkiko...@gmail.com>,
== David Laight <david.lai...@aculab.com>, Bj?rn Mork <bj...@mork.no>
==Subject: [PATCH net-next 11/11] net: cdc_ncm: remove redundant "disconnected"
== flag
==
==Calling netif_carrier_{on,off} is sufficient. There is no need
==to duplicate the carrier state in a driver specific flag.
==
==Signed-off-by: Bj?rn Mork <bj...@mork.no>
==---
== drivers/net/usb/cdc_ncm.c | 19 ++-----------------
== drivers/net/usb/huawei_cdc_ncm.c | 13 -------------
== include/linux/usb/cdc_ncm.h | 1 -
== 3 files changed, 2 insertions(+), 31 deletions(-)
==
==diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
==index c65145671521..114d56b9fe29 100644
==--- a/drivers/net/usb/cdc_ncm.c
==+++ b/drivers/net/usb/cdc_ncm.c
==@@ -1353,11 +1353,10 @@ static void cdc_ncm_status(struct usbnet *dev, struct
urb *urb)
== * USB_CDC_NOTIFY_NETWORK_CONNECTION notification shall be
== * sent by device after USB_CDC_NOTIFY_SPEED_CHANGE.
== */
==- ctx->connected = le16_to_cpu(event->wValue);
== netif_info(dev, link, dev->net,
== "network connection: %sconnected\n",
==- ctx->connected ? "" : "dis");
==- usbnet_link_change(dev, ctx->connected, 0);
==+ !!event->wValue ? "" : "dis");
==+ usbnet_link_change(dev, !!event->wValue, 0);
== break;
==
== case USB_CDC_NOTIFY_SPEED_CHANGE:
==@@ -1377,23 +1376,11 @@ static void cdc_ncm_status(struct usbnet *dev, struct
urb *urb)
== }
== }
==
==-static int cdc_ncm_check_connect(struct usbnet *dev)
==-{
==- struct cdc_ncm_ctx *ctx;
==-
==- ctx = (struct cdc_ncm_ctx *)dev->data[0];
==- if (ctx == NULL)
==- return 1; /* disconnected */
==-
==- return !ctx->connected;
==-}
==-
== static const struct driver_info cdc_ncm_info = {
== .description = "CDC NCM",
== .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET,
== .bind = cdc_ncm_bind,
== .unbind = cdc_ncm_unbind,
==- .check_connect = cdc_ncm_check_connect,
== .manage_power = usbnet_manage_power,
== .status = cdc_ncm_status,
== .rx_fixup = cdc_ncm_rx_fixup,
==@@ -1407,7 +1394,6 @@ static const struct driver_info wwan_info = {
== | FLAG_WWAN,
== .bind = cdc_ncm_bind,
== .unbind = cdc_ncm_unbind,
==- .check_connect = cdc_ncm_check_connect,
== .manage_power = usbnet_manage_power,
== .status = cdc_ncm_status,
== .rx_fixup = cdc_ncm_rx_fixup,
==@@ -1421,7 +1407,6 @@ static const struct driver_info wwan_noarp_info = {
== | FLAG_WWAN | FLAG_NOARP,
== .bind = cdc_ncm_bind,
== .unbind = cdc_ncm_unbind,
==- .check_connect = cdc_ncm_check_connect,
== .manage_power = usbnet_manage_power,
== .status = cdc_ncm_status,
== .rx_fixup = cdc_ncm_rx_fixup,
==diff --git a/drivers/net/usb/huawei_cdc_ncm.c
b/drivers/net/usb/huawei_cdc_ncm.c
==index 312178d7b698..f9822bc75425 100644
==--- a/drivers/net/usb/huawei_cdc_ncm.c
==+++ b/drivers/net/usb/huawei_cdc_ncm.c
==@@ -172,24 +172,11 @@ err:
== return ret;
== }
==
==-static int huawei_cdc_ncm_check_connect(struct usbnet *usbnet_dev)
==-{
==- struct cdc_ncm_ctx *ctx;
==-
==- ctx = (struct cdc_ncm_ctx *)usbnet_dev->data[0];
==-
==- if (ctx == NULL)
==- return 1; /* disconnected */
==-
==- return !ctx->connected;
==-}
==-
== static const struct driver_info huawei_cdc_ncm_info = {
== .description = "Huawei CDC NCM device",
== .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
== .bind = huawei_cdc_ncm_bind,
== .unbind = huawei_cdc_ncm_unbind,
==- .check_connect = huawei_cdc_ncm_check_connect,
== .manage_power = huawei_cdc_ncm_manage_power,
== .rx_fixup = cdc_ncm_rx_fixup,
== .tx_fixup = cdc_ncm_tx_fixup,
==diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
==index 1921bdadd9ab..dc175b1debdf 100644
==--- a/include/linux/usb/cdc_ncm.h
==+++ b/include/linux/usb/cdc_ncm.h
==@@ -118,7 +118,6 @@ struct cdc_ncm_ctx {
== u16 tx_ndp_modulus;
== u16 tx_seq;
== u16 rx_seq;
==- u16 connected;
== u16 min_tx_pkt;
==
== /* statistics */
==--
==2.0.0.rc2
==
==
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
