From: Alexander Duyck <alexanderdu...@fb.com>

Replace instances of sprintf or memcpy with a pointer update with
ethtool_sprintf.

Signed-off-by: Alexander Duyck <alexanderdu...@fb.com>
---
 drivers/net/hyperv/netvsc_drv.c |   33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 15f262b70489..97b5c9b60503 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -1612,34 +1612,23 @@ static void netvsc_get_strings(struct net_device *dev, 
u32 stringset, u8 *data)
 
        switch (stringset) {
        case ETH_SS_STATS:
-               for (i = 0; i < ARRAY_SIZE(netvsc_stats); i++) {
-                       memcpy(p, netvsc_stats[i].name, ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
+               for (i = 0; i < ARRAY_SIZE(netvsc_stats); i++)
+                       ethtool_sprintf(&p, netvsc_stats[i].name);
 
-               for (i = 0; i < ARRAY_SIZE(vf_stats); i++) {
-                       memcpy(p, vf_stats[i].name, ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
+               for (i = 0; i < ARRAY_SIZE(vf_stats); i++)
+                       ethtool_sprintf(&p, vf_stats[i].name);
 
                for (i = 0; i < nvdev->num_chn; i++) {
-                       sprintf(p, "tx_queue_%u_packets", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "tx_queue_%u_bytes", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_packets", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_bytes", i);
-                       p += ETH_GSTRING_LEN;
-                       sprintf(p, "rx_queue_%u_xdp_drop", i);
-                       p += ETH_GSTRING_LEN;
+                       ethtool_sprintf(&p, "tx_queue_%u_packets", i);
+                       ethtool_sprintf(&p, "tx_queue_%u_bytes", i);
+                       ethtool_sprintf(&p, "rx_queue_%u_packets", i);
+                       ethtool_sprintf(&p, "rx_queue_%u_bytes", i);
+                       ethtool_sprintf(&p, "rx_queue_%u_xdp_drop", i);
                }
 
                for_each_present_cpu(cpu) {
-                       for (i = 0; i < ARRAY_SIZE(pcpu_stats); i++) {
-                               sprintf(p, pcpu_stats[i].name, cpu);
-                               p += ETH_GSTRING_LEN;
-                       }
+                       for (i = 0; i < ARRAY_SIZE(pcpu_stats); i++)
+                               ethtool_sprintf(&p, pcpu_stats[i].name, cpu);
                }
 
                break;


Reply via email to