net: usb: usb: remove old api ethtool_{get|set}_settings

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

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 1b40b189435ad9580944e838e8821007a51f3d67..13d4ec5f6f34f6bd16e29576a1e5cb0c1dd3dce9 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -947,39 +947,6 @@ EXPORT_SYMBOL_GPL(usbnet_open);
  * 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 @@ EXPORT_SYMBOL_GPL(usbnet_set_msglevel);
 
 /* 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 5bd80078b7fe5fb775dede0bbe5dbd9e945f9bae..e2b56917450f24e9d4a3926fa8b1796829fcba1a 100644 (file)
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -261,10 +261,6 @@ extern void usbnet_pause_rx(struct usbnet *);
 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,