]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
amd-xgbe: use ethtool string helpers
authorRosen Penev <rosenp@gmail.com>
Tue, 22 Oct 2024 23:32:03 +0000 (16:32 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 29 Oct 2024 22:56:03 +0000 (15:56 -0700)
The latter is the preferred way to copy ethtool strings.

Avoids manually incrementing the pointer.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241022233203.9670-1-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

index 5fc94c2f638e0435c8bfd0b83e8b0b21d49cdaa2..4431ab1c18b320856daec38cbdbb97dac7269b82 100644 (file)
@@ -195,23 +195,19 @@ static void xgbe_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 
        switch (stringset) {
        case ETH_SS_STATS:
-               for (i = 0; i < XGBE_STATS_COUNT; i++) {
-                       memcpy(data, xgbe_gstring_stats[i].stat_string,
-                              ETH_GSTRING_LEN);
-                       data += ETH_GSTRING_LEN;
-               }
+               for (i = 0; i < XGBE_STATS_COUNT; i++)
+                       ethtool_puts(&data, xgbe_gstring_stats[i].stat_string);
+
                for (i = 0; i < pdata->tx_ring_count; i++) {
-                       sprintf(data, "txq_%u_packets", i);
-                       data += ETH_GSTRING_LEN;
-                       sprintf(data, "txq_%u_bytes", i);
-                       data += ETH_GSTRING_LEN;
+                       ethtool_sprintf(&data, "txq_%u_packets", i);
+                       ethtool_sprintf(&data, "txq_%u_bytes", i);
                }
+
                for (i = 0; i < pdata->rx_ring_count; i++) {
-                       sprintf(data, "rxq_%u_packets", i);
-                       data += ETH_GSTRING_LEN;
-                       sprintf(data, "rxq_%u_bytes", i);
-                       data += ETH_GSTRING_LEN;
+                       ethtool_sprintf(&data, "rxq_%u_packets", i);
+                       ethtool_sprintf(&data, "rxq_%u_bytes", i);
                }
+
                break;
        }
 }