ibmvnic: use ethtool string helpers

They are the preferred way to copy ethtool strings.

Avoids manually incrementing the data pointer.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Tested-by: Nick Child <nnac123@linux.ibm.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241022203240.391648-1-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index cca2ed6ad289903fd64be91a50aa68e36a9b0c66..e95ae0d39948c888fd5c639c2bc400dd867b0984 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3808,32 +3808,20 @@ static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data)
        if (stringset != ETH_SS_STATS)
                return;
 
-       for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++, data += ETH_GSTRING_LEN)
-               memcpy(data, ibmvnic_stats[i].name, ETH_GSTRING_LEN);
+       for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++)
+               ethtool_puts(&data, ibmvnic_stats[i].name);
 
        for (i = 0; i < adapter->req_tx_queues; i++) {
-               snprintf(data, ETH_GSTRING_LEN, "tx%d_batched_packets", i);
-               data += ETH_GSTRING_LEN;
-
-               snprintf(data, ETH_GSTRING_LEN, "tx%d_direct_packets", i);
-               data += ETH_GSTRING_LEN;
-
-               snprintf(data, ETH_GSTRING_LEN, "tx%d_bytes", i);
-               data += ETH_GSTRING_LEN;
-
-               snprintf(data, ETH_GSTRING_LEN, "tx%d_dropped_packets", i);
-               data += ETH_GSTRING_LEN;
+               ethtool_sprintf(&data, "tx%d_batched_packets", i);
+               ethtool_sprintf(&data, "tx%d_direct_packets", i);
+               ethtool_sprintf(&data, "tx%d_bytes", i);
+               ethtool_sprintf(&data, "tx%d_dropped_packets", i);
        }
 
        for (i = 0; i < adapter->req_rx_queues; i++) {
-               snprintf(data, ETH_GSTRING_LEN, "rx%d_packets", i);
-               data += ETH_GSTRING_LEN;
-
-               snprintf(data, ETH_GSTRING_LEN, "rx%d_bytes", i);
-               data += ETH_GSTRING_LEN;
-
-               snprintf(data, ETH_GSTRING_LEN, "rx%d_interrupts", i);
-               data += ETH_GSTRING_LEN;
+               ethtool_sprintf(&data, "rx%d_packets", i);
+               ethtool_sprintf(&data, "rx%d_bytes", i);
+               ethtool_sprintf(&data, "rx%d_interrupts", i);
        }
 }