From patchwork Thu Mar 16 22:18:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 740055 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vkjgC2zcJz9s0Z for ; Fri, 17 Mar 2017 09:23:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KRc2taGj"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754430AbdCPWUW (ORCPT ); Thu, 16 Mar 2017 18:20:22 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:33548 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753916AbdCPWUG (ORCPT ); Thu, 16 Mar 2017 18:20:06 -0400 Received: by mail-wr0-f194.google.com with SMTP id g10so7551395wrg.0; Thu, 16 Mar 2017 15:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8zDITZnoknJpuhyOHYOVp/Hso5ZYuN5s/1IBBX6Y+2I=; b=KRc2taGj6pPE8mvlhhTTOeT2V33qC72FgUjxQBSzKrq8INRyCVfo0WMAD2PvCl18lQ s5/aeSX8LGV8vb7BswHcquZmK8h1eeVGYumqGcO7VIiuUP8SSfhYI7eNZl9NWaukkh0O xlBVl7capUU242cCyG3O5erRz41i56f1tT9x6L2o3b17x6/01q2gCB4fqU6YDI9f0XzJ kPDLe5sOqjwXnP5Bf7/PwhH//QusXnU7yErUkofBHynSf4RA2fSqGAEqwFbI8K1LcIh0 FQT+MZgtV/AwUBCvYWdPqTNv4ZmOZY5X9yy9cNDlQQtiPjPtgKknyfGzPOEbFl21wl7U aU8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8zDITZnoknJpuhyOHYOVp/Hso5ZYuN5s/1IBBX6Y+2I=; b=ML3eF9d5XYdUPYbqoR0PZS9arZYi4QSQaj5Ag2Db1RN4BAVoFZFYfS0gwsDdBNwCZC Vp2/O1AmNKOwSysdRiQtYQs/7lK8114Dxi9K+IRXvYN4IulK4ekIzJDPqL6fgTR/jk7Z uE+X+rFIgS3Nhs+NKcB11bPL4aa8QtVtlwc4AnyLjDMmhJQ1Y4qLGm1tmtatTtUR3Kul xVnrBpeAO7HxHA0c0f8WDA/VnlLhSA8K09K0C5z9p86rYH6zJEMr2oMDnkSqBJ/8svIV vwAzAXjuUgKPEVw6u5kkneuq5Dh3CKmsdFwXdTdlxP+vw9guuQ6J5DMPWg5xSHdVnOQ4 jmaw== X-Gm-Message-State: AFeK/H0b7iJ+L3mjCfwFGg9K9ou1IJv7ERig3nsVuYxFpg8/wK82mmCZV7IhwHhzQE0fjg== X-Received: by 10.223.172.77 with SMTP id v71mr11578263wrc.131.1489702762904; Thu, 16 Mar 2017 15:19:22 -0700 (PDT) Received: from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net. [88.161.33.221]) by smtp.gmail.com with ESMTPSA id 17sm7735553wru.16.2017.03.16.15.19.21 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Mar 2017 15:19:22 -0700 (PDT) From: Philippe Reynes To: oliver@neukum.org, jacmet@sunsite.dk, steve.glendinning@shawell.net, UNGLinuxDriver@microchip.com, gregkh@linuxfoundation.org, davem@davemloft.net, robert.foss@collabora.com, allan@asix.com.tw, grundler@google.com, jarod@redhat.com, peter.chen@nxp.com, stefan.bruens@rwth-aachen.de, akpm@linux-foundation.org, adobriyan@gmail.com Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH 11/11] net: usb: usb: remove old api ethtool_{get|set}_settings Date: Thu, 16 Mar 2017 23:18:57 +0100 Message-Id: <1489702737-2401-12-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1489702737-2401-1-git-send-email-tremyfr@gmail.com> References: <1489702737-2401-1-git-send-email-tremyfr@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The function usbnet_{get|set}_settings is no longer used, so we remove it. Signed-off-by: Philippe Reynes Acked-by: Oliver Neukum --- drivers/net/usb/usbnet.c | 35 ----------------------------------- include/linux/usb/usbnet.h | 4 ---- 2 files changed, 0 insertions(+), 39 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 1b40b18..13d4ec5 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -947,39 +947,6 @@ int usbnet_open (struct net_device *net) * they'll probably want to use this base set. */ -int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd) -{ - struct usbnet *dev = netdev_priv(net); - - if (!dev->mii.mdio_read) - return -EOPNOTSUPP; - - return mii_ethtool_gset(&dev->mii, cmd); -} -EXPORT_SYMBOL_GPL(usbnet_get_settings); - -int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd) -{ - struct usbnet *dev = netdev_priv(net); - int retval; - - if (!dev->mii.mdio_write) - return -EOPNOTSUPP; - - retval = mii_ethtool_sset(&dev->mii, cmd); - - /* link speed/duplex might have changed */ - if (dev->driver_info->link_reset) - dev->driver_info->link_reset(dev); - - /* hard_mtu or rx_urb_size may change in link_reset() */ - usbnet_update_max_qlen(dev); - - return retval; - -} -EXPORT_SYMBOL_GPL(usbnet_set_settings); - int usbnet_get_link_ksettings(struct net_device *net, struct ethtool_link_ksettings *cmd) { @@ -1072,8 +1039,6 @@ void usbnet_set_msglevel (struct net_device *net, u32 level) /* drivers may override default ethtool_ops in their bind() routine */ static const struct ethtool_ops usbnet_ethtool_ops = { - .get_settings = usbnet_get_settings, - .set_settings = usbnet_set_settings, .get_link = usbnet_get_link, .nway_reset = usbnet_nway_reset, .get_drvinfo = usbnet_get_drvinfo, diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 5bd8007..e2b5691 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -261,10 +261,6 @@ extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb, extern void usbnet_resume_rx(struct usbnet *); extern void usbnet_purge_paused_rxq(struct usbnet *); -extern int usbnet_get_settings(struct net_device *net, - struct ethtool_cmd *cmd); -extern int usbnet_set_settings(struct net_device *net, - struct ethtool_cmd *cmd); extern int usbnet_get_link_ksettings(struct net_device *net, struct ethtool_link_ksettings *cmd); extern int usbnet_set_link_ksettings(struct net_device *net,