ethtool: remove phys_id from ethtool_ops

After that all the upstream kernel drivers now use phys_id,
and the old ethtool_ops interface (phys_id) can be removed.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 5 deletions

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index d8b1a8d85a96..927819d92248 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1655,7 +1655,7 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
         static bool busy;
         int rc;
 
-        if (!dev->ethtool_ops->set_phys_id && !dev->ethtool_ops->phys_id)
+        if (!dev->ethtool_ops->set_phys_id)
                 return -EOPNOTSUPP;
 
         if (busy)
@@ -1664,10 +1664,6 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
         if (copy_from_user(&id, useraddr, sizeof(id)))
                 return -EFAULT;
 
-        if (!dev->ethtool_ops->set_phys_id)
-                /* Do it the old way */
-                return dev->ethtool_ops->phys_id(dev, id.data);
-
         rc = dev->ethtool_ops->set_phys_id(dev, ETHTOOL_ID_ACTIVE);
         if (rc < 0)
                 return rc;