vmxnet3: Update driver to use ethtool_sprintf

So this patch actually does 3 things.

First it removes a stray white space at the start of the variable
declaration in vmxnet3_get_strings.

Second it flips the logic for the string test so that we exit immediately
if we are not looking for the stats strings. Doing this we can avoid
unnecessary indentation and line wrapping.

Then finally it updates the code to use ethtool_sprintf rather than a
memcpy and pointer increment to write the ethtool strings.

Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 7ec8652..c0bd9cb 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -218,43 +218,28 @@ vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 static void
 vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
 {
-        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
-       if (stringset == ETH_SS_STATS) {
-               int i, j;
-               for (j = 0; j < adapter->num_tx_queues; j++) {
-                       for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
-                               memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
-                                      ETH_GSTRING_LEN);
-                               buf += ETH_GSTRING_LEN;
-                       }
-                       for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats);
-                            i++) {
-                               memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
-                                      ETH_GSTRING_LEN);
-                               buf += ETH_GSTRING_LEN;
-                       }
-               }
+       struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+       int i, j;
 
-               for (j = 0; j < adapter->num_rx_queues; j++) {
-                       for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
-                               memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
-                                      ETH_GSTRING_LEN);
-                               buf += ETH_GSTRING_LEN;
-                       }
-                       for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats);
-                            i++) {
-                               memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
-                                      ETH_GSTRING_LEN);
-                               buf += ETH_GSTRING_LEN;
-                       }
-               }
+       if (stringset != ETH_SS_STATS)
+               return;
 
-               for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
-                       memcpy(buf, vmxnet3_global_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                       buf += ETH_GSTRING_LEN;
-               }
+       for (j = 0; j < adapter->num_tx_queues; j++) {
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
+                       ethtool_sprintf(&buf, vmxnet3_tq_dev_stats[i].desc);
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
+                       ethtool_sprintf(&buf, vmxnet3_tq_driver_stats[i].desc);
+       }
+
+       for (j = 0; j < adapter->num_rx_queues; j++) {
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
+                       ethtool_sprintf(&buf, vmxnet3_rq_dev_stats[i].desc);
+               for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
+                       ethtool_sprintf(&buf, vmxnet3_rq_driver_stats[i].desc);
        }
+
+       for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++)
+               ethtool_sprintf(&buf, vmxnet3_global_stats[i].desc);
 }
 
 netdev_features_t vmxnet3_fix_features(struct net_device *netdev,