From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbcAAQzD (ORCPT ); Fri, 1 Jan 2016 11:55:03 -0500 Received: from mout.web.de ([212.227.15.14]:57038 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbcAAQy6 (ORCPT ); Fri, 1 Jan 2016 11:54:58 -0500 Subject: [PATCH 1/2] net-qmi_wwan: Refactoring for qmi_wwan_bind() To: linux-usb@vger.kernel.org, netdev@vger.kernel.org, =?UTF-8?Q?Bj=c3=b8rn_Mork?= References: <566ABCD9.1060404@users.sourceforge.net> <5686AE52.1020008@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5686AF55.5020801@users.sourceforge.net> Date: Fri, 1 Jan 2016 17:54:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <5686AE52.1020008@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:sOZeBANFjWsnsHLsCkvgyXpAb59joNlyonibTC+XrEBJJOzoAO+ sziF2crQSSwqKxmqjNKJKPG2V78PvINsKEYeMsYxDGcWOuFWPE9aPznZikWrDsFkOnupmpd Q7nmWXJuvsGwuQV1UJeaMGF1MWhRJR5/RdEXnM9tRy7ebo7kZY6j5AizmXTVbKlj4DhtczT DKDLcpEu9OI8Y/d2+FRQA== X-UI-Out-Filterresults: notjunk:1;V01:K0:K++0/qsyUjs=:d6+iG+djYCKGBbxSkigK/n 2C0l4t++M4zdcEKPjUq4lb93Ly1EyPLepSjXfvxjBX2MJF9X2Ic9vg5o0+wlZwztoZk/lSv1A 2Lz1B2rR05bueKNHrMQGySRMyGWFfoveosvql5csKXOOUpQs83CBSR6tkcIfAfu8yX6TXXNjG TmPB5zMzvVx6Hzi7KzMw8Vg8IxTxfS5qjdGCDOWewU+kfkmsF3GenSvLAM+XWHTNMsQGEsOjg +HrcZWQVl77oi0XY9ncRZMkUBfRkDqiTpZCjiKmx0ij3ktyJlMA4F75h8oPAn2Tze0wSR5m/2 hcd/B3kcQcDRHdgb+igdQZdk4ir4qbYByXuAGFz3VCYCSfuqg3JKXOUk7oiJ1D+7hv4bpU56M jJFobLJlbEzyN1mpFXrwa7zNImqX9PyfJfrE5dafoiBjda1RPbzqUa/jSbBW8qHkZHbUt6VW5 gnlSLAizi8sj/qTM67Zm0H63Uq7sdCPVgDgz32D8KhmMe+kMQrXp2N2bwVBfH8qk219eZegeb viK7oXwo0uCsbZjeI/Il/Dlxx3ihI/F+uIxDmcInYpmm7WPOqEOTrzq34SidSTOOQ5LTqMlQb yBcWnvjxY4Sw7X/VCjE2fuDNLA2ppR18tY8TtjCGoTzD6VIX0W46TCqGb5JuBa0w3t5NbBl8g 2uU0RGNsIkHJrTF5BQyp3ocP9gR1UHO1yH9T0iLIbzs+mC9Oe15QwaKZ8/R+kP/V01MqCSW03 dMqZ0oaNxGN7L49ODtuIHrostXLaXq86VqY5t6ccYAYGs/bseX7blLQ2W5gjjO/grzoVo8Qnj Xuswym0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 1 Jan 2016 17:32:07 +0100 Reduce the scope for the local variable "desc" to one branch of an if statement. Signed-off-by: Markus Elfring --- drivers/net/usb/qmi_wwan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index d0b2973..5b8af06 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -345,7 +345,6 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) int status = -1; u8 *buf = intf->cur_altsetting->extra; int len = intf->cur_altsetting->extralen; - struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; struct usb_cdc_union_desc *cdc_union; struct usb_cdc_ether_desc *cdc_ether; struct usb_driver *driver = driver_of(intf); @@ -366,6 +365,8 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) /* Use separate control and data interfaces if we found a CDC Union */ if (cdc_union) { + struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; + info->data = usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0); if (desc->bInterfaceNumber != cdc_union->bMasterInterface0 || -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 1/2] net-qmi_wwan: Refactoring for qmi_wwan_bind() Date: Fri, 1 Jan 2016 17:54:45 +0100 Message-ID: <5686AF55.5020801@users.sourceforge.net> References: <566ABCD9.1060404@users.sourceforge.net> <5686AE52.1020008@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: LKML , kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Julia Lawall To: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, =?UTF-8?Q?Bj=c3=b8rn_Mork?= Return-path: In-Reply-To: <5686AE52.1020008-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org> Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org From: Markus Elfring Date: Fri, 1 Jan 2016 17:32:07 +0100 Reduce the scope for the local variable "desc" to one branch of an if statement. Signed-off-by: Markus Elfring --- drivers/net/usb/qmi_wwan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index d0b2973..5b8af06 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -345,7 +345,6 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) int status = -1; u8 *buf = intf->cur_altsetting->extra; int len = intf->cur_altsetting->extralen; - struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; struct usb_cdc_union_desc *cdc_union; struct usb_cdc_ether_desc *cdc_ether; struct usb_driver *driver = driver_of(intf); @@ -366,6 +365,8 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) /* Use separate control and data interfaces if we found a CDC Union */ if (cdc_union) { + struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; + info->data = usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0); if (desc->bInterfaceNumber != cdc_union->bMasterInterface0 || -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Fri, 01 Jan 2016 16:54:45 +0000 Subject: [PATCH 1/2] net-qmi_wwan: Refactoring for qmi_wwan_bind() Message-Id: <5686AF55.5020801@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <5686AE52.1020008@users.sourceforge.net> In-Reply-To: <5686AE52.1020008@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-usb@vger.kernel.org, netdev@vger.kernel.org, =?UTF-8?Q?Bj=c3=b8rn_Mork?= Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Fri, 1 Jan 2016 17:32:07 +0100 Reduce the scope for the local variable "desc" to one branch of an if statement. Signed-off-by: Markus Elfring --- drivers/net/usb/qmi_wwan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index d0b2973..5b8af06 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -345,7 +345,6 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) int status = -1; u8 *buf = intf->cur_altsetting->extra; int len = intf->cur_altsetting->extralen; - struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; struct usb_cdc_union_desc *cdc_union; struct usb_cdc_ether_desc *cdc_ether; struct usb_driver *driver = driver_of(intf); @@ -366,6 +365,8 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) /* Use separate control and data interfaces if we found a CDC Union */ if (cdc_union) { + struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; + info->data = usb_ifnum_to_if(dev->udev, cdc_union->bSlaveInterface0); if (desc->bInterfaceNumber != cdc_union->bMasterInterface0 || -- 2.6.3