linux-mips
[Top] [All Lists]

[PATCH net-next v2 15/17] net: ethtool: remove unused __ethtool_get_sett

To: "David S. Miller" <davem@davemloft.net>, Ben Hutchings <ben@decadent.org.uk>, Amir Vadai <amirv@mellanox.com>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org
Subject: [PATCH net-next v2 15/17] net: ethtool: remove unused __ethtool_get_settings
From: David Decotigny <ddecotig@gmail.com>
Date: Wed, 4 Feb 2015 11:53:39 -0800
Cc: Eric Dumazet <edumazet@google.com>, Eugenia Emantayev <eugenia@mellanox.co.il>, Or Gerlitz <ogerlitz@mellanox.com>, Ido Shamay <idos@mellanox.com>, Joe Perches <joe@perches.com>, Saeed Mahameed <saeedm@mellanox.com>, Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru <VenkatKumar.Duvvuru@Emulex.Com>, Jeff Kirsher <jeffrey.t.kirsher@intel.com>, Eyal Perry <eyalpe@mellanox.com>, Pravin B Shelar <pshelar@nicira.com>, Ed Swierk <eswierk@skyportsystems.com>, Upinder Malhi <umalhi@cisco.com>, Robert Love <robert.w.love@intel.com>, "James E.J. Bottomley" <JBottomley@parallels.com>, David Decotigny <decot@googlers.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2t/VxxhKRMlN3Ez8ARLuAtT2lNvWeXI2Ak85YdOzPhs=; b=ENsjo8TGJvcxDaFOXFsTV7x+f9D6Lxh23punt7vE/PW5VKuzYFMZGHilpnVVvFC6uF vrOr+XhEWTEMwolfEe3zAoZsiePdphrWB87Ff5LWQc7Kxcn7D7GOXW45Vqe3Kd/ZVmTs pC/RdoMc4n+HLayCTSLWtiApYXMeiIEwCUrMU+nzY7MEgnq8tFUComwe00AnmD8Ev54u skt+D4Ea+X9voGuMPUyk14I5kZgRAKZIlXYZypDuYXfQuzu7R0betEKwNf3pdlPOQEvs QJ+f+0paKOTuRE42EMX50Q0iLd4/SDNYSTdXeiwuaPt4D83SN3TgADImIqM2SXVbzJDD Vgzg==
In-reply-to: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Decotigny <decot@googlers.com>

replaced by __ethtool_get_ksettings.

Signed-off-by: David Decotigny <decot@googlers.com>
---
 include/linux/ethtool.h |  4 ----
 net/core/ethtool.c      | 49 ++++++++++++++-----------------------------------
 2 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 49881b6..d9c8fab 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -160,10 +160,6 @@ __ethtool_add_link_modes(ethtool_link_mode_mask_t *dst,
 extern int __ethtool_get_ksettings(struct net_device *dev,
                                   struct ethtool_ksettings *ksettings);
 
-/* DEPRECATED, use __ethtool_get_ksettings */
-extern int __ethtool_get_settings(struct net_device *dev,
-                                 struct ethtool_cmd *cmd);
-
 /**
  * struct ethtool_ops - optional netdev operations
  * @get_settings: DEPRECATED, use %get_ksettings/%set_ksettings
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 11cb1c9..2b432ef 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -487,15 +487,16 @@ int __ethtool_get_ksettings(struct net_device *dev,
                return dev->ethtool_ops->get_ksettings(dev, ksettings);
        }
 
-       /* TODO: remove what follows when ethtool_ops::get_settings
-        * disappears internally
-        */
-
        /* driver doesn't support %ethtool_ksettings API. revert to
         * legacy %ethtool_cmd API, unless it's not supported either.
         * TODO: remove when ethtool_ops::get_settings disappears internally
         */
-       err = __ethtool_get_settings(dev, &cmd);
+       if (!dev->ethtool_ops->get_settings)
+               return -EOPNOTSUPP;
+
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.cmd = ETHTOOL_GSET;
+       err = dev->ethtool_ops->get_settings(dev, &cmd);
        if (err < 0)
                return err;
 
@@ -711,30 +712,6 @@ static int ethtool_set_ksettings(struct net_device *dev, 
void __user *useraddr)
        return dev->ethtool_ops->set_ksettings(dev, &ksettings);
 }
 
-/* Internal kernel helper to query a device ethtool_cmd settings.
- *
- * Note about transition to ethtool_settings API: We do not need (or
- * want) this function to support "dev" instances that implement the
- * ethtool_settings API as we will update the drivers calling this
- * function to call __ethtool_get_ksettings instead, before the first
- * drivers implement ethtool_ops::get_ksettings.
- *
- * TODO 1: at least make this function static when no driver is using it
- * TODO 2: remove when ethtool_ops::get_settings disappears internally
- */
-int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       ASSERT_RTNL();
-
-       if (!dev->ethtool_ops->get_settings)
-               return -EOPNOTSUPP;
-
-       memset(cmd, 0, sizeof(struct ethtool_cmd));
-       cmd->cmd = ETHTOOL_GSET;
-       return dev->ethtool_ops->get_settings(dev, cmd);
-}
-EXPORT_SYMBOL(__ethtool_get_settings);
-
 /* Query device for its ethtool_cmd settings.
  *
  * Backward compatibility note: for compatibility with legacy ethtool,
@@ -776,16 +753,18 @@ static int ethtool_get_settings(struct net_device *dev, 
void __user *useraddr)
                /* send a sensible cmd tag back to user */
                cmd.cmd = ETHTOOL_GSET;
        } else {
-               int err;
-               /* TODO: return -EOPNOTSUPP when
-                * ethtool_ops::get_settings disappears internally
-                */
-
                /* driver doesn't support %ethtool_ksettings
                 * API. revert to legacy %ethtool_cmd API, unless it's
                 * not supported either.
                 */
-               err = __ethtool_get_settings(dev, &cmd);
+               int err;
+
+               if (!dev->ethtool_ops->get_settings)
+                       return -EOPNOTSUPP;
+
+               memset(&cmd, 0, sizeof(cmd));
+               cmd.cmd = ETHTOOL_GSET;
+               err = dev->ethtool_ops->get_settings(dev, &cmd);
                if (err < 0)
                        return err;
        }
-- 
2.2.0.rc0.207.ga3a616c


<Prev in Thread] Current Thread [Next in Thread>