netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Reynes <tremyfr@gmail.com>
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 <tremyfr@gmail.com>
Subject: [PATCH 11/11] net: usb: usb: remove old api ethtool_{get|set}_settings
Date: Thu, 16 Mar 2017 23:18:57 +0100	[thread overview]
Message-ID: <1489702737-2401-12-git-send-email-tremyfr@gmail.com> (raw)
In-Reply-To: <1489702737-2401-1-git-send-email-tremyfr@gmail.com>

The function usbnet_{get|set}_settings is no longer used,
so we remove it.

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
---
 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,
-- 
1.7.4.4

  parent reply	other threads:[~2017-03-16 22:18 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-16 22:18 [PATCH 00/11] net: usbnet: move to new api ethtool_{get|set}_link_ksettings Philippe Reynes
2017-03-16 22:18 ` [PATCH 01/11] net: usb: usbnet: add " Philippe Reynes
2017-03-20  6:39   ` Oliver Neukum
2017-03-21 11:33   ` Oliver Neukum
2017-03-21 23:03     ` David Miller
2017-03-16 22:18 ` [PATCH 02/11] net: usb: smsc95xx: use " Philippe Reynes
2017-03-16 22:18 ` [PATCH 03/11] net: usb: sr9800: " Philippe Reynes
     [not found] ` <1489702737-2401-1-git-send-email-tremyfr-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-16 22:18   ` [PATCH 04/11] net: usb: cdc_ncm: " Philippe Reynes
2017-03-16 22:18 ` [PATCH 05/11] net: usb: dm9601: " Philippe Reynes
2017-03-16 22:18 ` [PATCH 06/11] net: usb: mcs7830: " Philippe Reynes
2017-03-21 14:36   ` poma
2017-03-16 22:18 ` [PATCH 07/11] net: usb: sierra_net: " Philippe Reynes
2017-03-16 22:18 ` [PATCH 08/11] net: usb: smsc75xx: " Philippe Reynes
2017-03-16 22:18 ` [PATCH 09/11] net: usb: sr9700: " Philippe Reynes
2017-03-16 22:18 ` [PATCH 10/11] net: usb: asix: " Philippe Reynes
2017-03-16 22:18 ` Philippe Reynes [this message]
     [not found]   ` <1489702737-2401-12-git-send-email-tremyfr-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-20  6:40     ` [PATCH 11/11] net: usb: usb: remove old api ethtool_{get|set}_settings Oliver Neukum
2017-03-21 23:04 ` [PATCH 00/11] net: usbnet: move to new api ethtool_{get|set}_link_ksettings 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=1489702737-2401-12-git-send-email-tremyfr@gmail.com \
    --to=tremyfr@gmail.com \
    --cc=UNGLinuxDriver@microchip.com \
    --cc=adobriyan@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=allan@asix.com.tw \
    --cc=davem@davemloft.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=grundler@google.com \
    --cc=jacmet@sunsite.dk \
    --cc=jarod@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oliver@neukum.org \
    --cc=peter.chen@nxp.com \
    --cc=robert.foss@collabora.com \
    --cc=stefan.bruens@rwth-aachen.de \
    --cc=steve.glendinning@shawell.net \
    /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).