net: Convert ethtool {get_stats, self_test}_count() ops to get_sset_count()

These string query operations were supposed to be replaced by the
generic get_sset_count() starting in 2007.  Convert the remaining
implementations.

Also remove calls to these operations to initialise drvinfo->n_stats.
The ethtool core code already does that.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index e593af3354b8..de18fdfdadf2 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1080,11 +1080,14 @@ static int nes_netdev_set_rx_csum(struct net_device *netdev, u32 enable)
 
 
 /**
- * nes_netdev_get_stats_count
+ * nes_netdev_get_sset_count
  */
-static int nes_netdev_get_stats_count(struct net_device *netdev)
+static int nes_netdev_get_sset_count(struct net_device *netdev, int stringset)
 {
-        return NES_ETHTOOL_STAT_COUNT;
+        if (stringset == ETH_SS_STATS)
+                return NES_ETHTOOL_STAT_COUNT;
+        else
+                return -EINVAL;
 }
 
 
@@ -1264,7 +1267,6 @@ static void nes_netdev_get_drvinfo(struct net_device *netdev,
         sprintf(drvinfo->fw_version, "%u.%u", nesadapter->firmware_version>>16,
                                 nesadapter->firmware_version & 0x000000ff);
         strcpy(drvinfo->version, DRV_VERSION);
-        drvinfo->n_stats = nes_netdev_get_stats_count(netdev);
         drvinfo->testinfo_len = 0;
         drvinfo->eedump_len = 0;
         drvinfo->regdump_len = 0;
@@ -1516,7 +1518,7 @@ static const struct ethtool_ops nes_ethtool_ops = {
         .get_rx_csum = nes_netdev_get_rx_csum,
         .get_sg = ethtool_op_get_sg,
         .get_strings = nes_netdev_get_strings,
-        .get_stats_count = nes_netdev_get_stats_count,
+        .get_sset_count = nes_netdev_get_sset_count,
         .get_ethtool_stats = nes_netdev_get_ethtool_stats,
         .get_drvinfo = nes_netdev_get_drvinfo,
         .get_coalesce = nes_netdev_get_coalesce,