[netdrvr] Stop using legacy hooks ->self_test_count, ->get_stats_count

These have been superceded by the new ->get_sset_count() hook.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 2470903fbc74..6007147cc1e9 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -152,15 +152,19 @@ static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,
                         buf[i] = extra[i];
 }
 
-/* Returns the number of stats (and their corresponding strings) */
-static int gfar_stats_count(struct net_device *dev)
+static int gfar_sset_count(struct net_device *dev, int sset)
 {
         struct gfar_private *priv = netdev_priv(dev);
 
-        if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON)
-                return GFAR_STATS_LEN;
-        else
-                return GFAR_EXTRA_STATS_LEN;
+        switch (sset) {
+        case ETH_SS_STATS:
+                if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON)
+                        return GFAR_STATS_LEN;
+                else
+                        return GFAR_EXTRA_STATS_LEN;
+        default:
+                return -EOPNOTSUPP;
+        }
 }
 
 /* Fills in the drvinfo structure with some basic info */
@@ -171,8 +175,6 @@ static void gfar_gdrvinfo(struct net_device *dev, struct
         strncpy(drvinfo->version, gfar_driver_version, GFAR_INFOSTR_LEN);
         strncpy(drvinfo->fw_version, "N/A", GFAR_INFOSTR_LEN);
         strncpy(drvinfo->bus_info, "N/A", GFAR_INFOSTR_LEN);
-        drvinfo->n_stats = GFAR_STATS_LEN;
-        drvinfo->testinfo_len = 0;
         drvinfo->regdump_len = 0;
         drvinfo->eedump_len = 0;
 }
@@ -575,7 +577,7 @@ const struct ethtool_ops gfar_ethtool_ops = {
         .get_ringparam = gfar_gringparam,
         .set_ringparam = gfar_sringparam,
         .get_strings = gfar_gstrings,
-        .get_stats_count = gfar_stats_count,
+        .get_sset_count = gfar_sset_count,
         .get_ethtool_stats = gfar_fill_stats,
         .get_rx_csum = gfar_get_rx_csum,
         .get_tx_csum = gfar_get_tx_csum,