RDMA: Use ethtool string helpers

Avoids having to manually increment the pointer.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20241021011543.5922-1-rosenp@gmail.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
index 7da94fb8d7fa23450f8d09e1543842030f14dad5..4feb7170535cb0501fa8b76f965c1b831a7ec287 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
@@ -128,16 +128,13 @@ static void ipoib_get_ethtool_stats(struct net_device *dev,
 static void ipoib_get_strings(struct net_device __always_unused *dev,
                              u32 stringset, u8 *data)
 {
-       u8 *p = data;
        int i;
 
        switch (stringset) {
        case ETH_SS_STATS:
-               for (i = 0; i < IPOIB_GLOBAL_STATS_LEN; i++) {
-                       memcpy(p, ipoib_gstrings_stats[i].stat_string,
-                               ETH_GSTRING_LEN);
-                       p += ETH_GSTRING_LEN;
-               }
+               for (i = 0; i < IPOIB_GLOBAL_STATS_LEN; i++)
+                       ethtool_puts(&data,
+                                    ipoib_gstrings_stats[i].stat_string);
                break;
        default:
                break;

diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
index 29b3d8fce3f5f376ce7a552ae34764525033851f..316959940d2fcbf91228cf6df00f2b6b692ed020 100644 (file)
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c
@@ -164,9 +164,7 @@ static void vnic_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
                return;
 
        for (i = 0; i < VNIC_STATS_LEN; i++)
-               memcpy(data + i * ETH_GSTRING_LEN,
-                      vnic_gstrings_stats[i].stat_string,
-                      ETH_GSTRING_LEN);
+               ethtool_puts(&data, vnic_gstrings_stats[i].stat_string);
 }
 
 /* ethtool ops */