From patchwork Sat Jun 30 17:32:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Miguel_Rodr=C3=ADguez_P=C3=A9rez?= X-Patchwork-Id: 10498359 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E47760284 for ; Sat, 30 Jun 2018 17:32:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64A4628A5E for ; Sat, 30 Jun 2018 17:32:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56F9B28FC5; Sat, 30 Jun 2018 17:32:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E463728A5E for ; Sat, 30 Jun 2018 17:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751434AbeF3Rc2 (ORCPT ); Sat, 30 Jun 2018 13:32:28 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:42468 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751259AbeF3Rc0 (ORCPT ); Sat, 30 Jun 2018 13:32:26 -0400 Received: by mail-wr0-f193.google.com with SMTP id p1-v6so11640725wrs.9 for ; Sat, 30 Jun 2018 10:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=det.uvigo.gal; s=clouddet; h=to:from:subject:openpgp:autocrypt:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=LIsS5oYChwufcvlrQNO125xeq+RioDk+cXxsLk480CI=; b=I2RwWAksVDFmghLH0SVK0u0n3B7edrQH009/Uh4+n1xd1tNJu8Lll6KqvEVYmpAwjd ZpQtx6yNNn2i8dClwLUEePGrHQ0Bo3yVetlzvkxV6F0LoMeQstpDVIILqmnYSkqn6WWZ 67vVbiZwdPpbVRq9be2YQ+WtWlfJk8zpvN8L8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:openpgp:autocrypt:message-id :date:user-agent:mime-version:content-language :content-transfer-encoding; bh=LIsS5oYChwufcvlrQNO125xeq+RioDk+cXxsLk480CI=; b=G8ZGdLaV1trx0Hrje59dX5Qj8kL+J1BL0k3R6yUoJeqjPXpyfbEALK5KKFnhLLgUqF roTfhQX9S+F2k98hoIqot3Hz+IG1eXuXN3NC1hSBwaC9k6J2b34RO8kzpiVXi2trklnX lqXQ70APzdovcpCoMN+P8kQAXiE0IWmcPz4MwZIEuDd6kRdOVxV7L4uhm5aD1tHIkf+4 w5hi1rI+kqBUmITXgqbkZrZ9cYtkpbX4pXcDBwCkV0p8tbIFEMRNz2RC8xQzGo8UuTOm c4QO5wfhErSGWl09no0w7Wk8L98UFIRyfsB7vhJH7WNMVbxyMCzPehbucV3EEDQ8XQSW CzVA== X-Gm-Message-State: APt69E0MAJEOildYiubVi9dWEJMndNb/jz/xjNDCMlCBPTxY0gw8/Z/Q 7/uPcb7TE1uHSS3lcqUKRXFIVg== X-Google-Smtp-Source: AAOMgpdky6N61WbQNwn0vX8SImeqsKvtUd4FuEzJX6mJJNQHJ3Z0Z8qV0xf5pMQurSbjuUA3nIWk0g== X-Received: by 2002:adf:9d93:: with SMTP id p19-v6mr15836443wre.12.1530379945563; Sat, 30 Jun 2018 10:32:25 -0700 (PDT) Received: from [192.168.1.19] (static.84.239.213.82.ibercom.com. [82.213.239.84]) by smtp.gmail.com with ESMTPSA id s12-v6sm4284591wrm.3.2018.06.30.10.32.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jun 2018 10:32:24 -0700 (PDT) To: linux-usb@vger.kernel.org, netdev@vger.kernel.org From: =?UTF-8?Q?Miguel_Rodr=c3=adguez_P=c3=a9rez?= Subject: [PATCH v2 1/4] Simplify usbnet_cdc_update_filter Openpgp: preference=signencrypt Autocrypt: addr=miguel@det.uvigo.gal; prefer-encrypt=mutual; keydata= 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 YHInhj+XVbAEvSrkZFlI6GfCPjY= Message-ID: <634ae5d9-c969-15a6-1831-10bd0719fe59@det.uvigo.gal> Date: Sat, 30 Jun 2018 19:32:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove some unneeded varibles to make the code easier to read and, replace the generic usb_control_msg function for the more specific usbnet_write_cmd. --- drivers/net/usb/cdc_ether.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 178b956501a7..815ed0dc18fe 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -77,9 +77,7 @@ static const u8 mbm_guid[16] = { static void usbnet_cdc_update_filter(struct usbnet *dev) { - struct cdc_state *info = (void *) &dev->data; - struct usb_interface *intf = info->control; - struct net_device *net = dev->net; + struct net_device *net = dev->net; u16 cdc_filter = USB_CDC_PACKET_TYPE_DIRECTED | USB_CDC_PACKET_TYPE_BROADCAST; @@ -93,16 +91,13 @@ static void usbnet_cdc_update_filter(struct usbnet *dev) if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) cdc_filter |= USB_CDC_PACKET_TYPE_ALL_MULTICAST; - usb_control_msg(dev->udev, - usb_sndctrlpipe(dev->udev, 0), + usbnet_write_cmd(dev, USB_CDC_SET_ETHERNET_PACKET_FILTER, - USB_TYPE_CLASS | USB_RECIP_INTERFACE, + USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE, cdc_filter, - intf->cur_altsetting->desc.bInterfaceNumber, + dev->intf->cur_altsetting->desc.bInterfaceNumber, NULL, - 0, - USB_CTRL_SET_TIMEOUT - ); + 0); } /* probes control interface, claims data interface, collects the bulk