net: phy: use ethtool string helpers

These are the preferred way to copy ethtool strings.

Avoids incrementing pointers all over the place.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20241029234641.11448-1-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index 2e1a46e121d9d095321f338cc92f6ebd1367ec1e..a2a862bae2ed1e1c75a75c58f8a598ddf6a57445 100644 (file)
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -801,10 +801,8 @@ static void adin_get_strings(struct phy_device *phydev, u8 *data)
 {
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) {
-               strscpy(&data[i * ETH_GSTRING_LEN],
-                       adin_hw_stats[i].string, ETH_GSTRING_LEN);
-       }
+       for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++)
+               ethtool_puts(&data, adin_hw_stats[i].string);
 }
 
 static int adin_read_mmd_stat_regs(struct phy_device *phydev,

diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index a00a667454a9b2cb560c0ed603a02bf941ffe5a6..ee438b71a0b455c4d95bc509209ba24dd75a5af7 100644 (file)
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -540,8 +540,7 @@ static void ip101g_get_strings(struct phy_device *phydev, u8 *data)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(ip101g_hw_stats); i++)
-               strscpy(data + i * ETH_GSTRING_LEN,
-                       ip101g_hw_stats[i].name, ETH_GSTRING_LEN);
+               ethtool_puts(&data, ip101g_hw_stats[i].name);
 }
 
 static u64 ip101g_get_stat(struct phy_device *phydev, int i)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 28aec37acd2ce37e1032a0e5ade23460744066b4..cd50cd6a7f75c13dc0c60de94ecddb8c9402e438 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -2020,10 +2020,8 @@ static void marvell_get_strings(struct phy_device *phydev, u8 *data)
        int count = marvell_get_sset_count(phydev);
        int i;
 
-       for (i = 0; i < count; i++) {
-               strscpy(data + i * ETH_GSTRING_LEN,
-                       marvell_hw_stats[i].string, ETH_GSTRING_LEN);
-       }
+       for (i = 0; i < count; i++)
+               ethtool_puts(&data, marvell_hw_stats[i].string);
 }
 
 static void marvell_get_strings_simple(struct phy_device *phydev, u8 *data)
@@ -2031,10 +2029,8 @@ static void marvell_get_strings_simple(struct phy_device *phydev, u8 *data)
        int count = marvell_get_sset_count_simple(phydev);
        int i;
 
-       for (i = 0; i < count; i++) {
-               strscpy(data + i * ETH_GSTRING_LEN,
-                       marvell_hw_stats_simple[i].string, ETH_GSTRING_LEN);
-       }
+       for (i = 0; i < count; i++)
+               ethtool_puts(&data, marvell_hw_stats_simple[i].string);
 }
 
 static u64 marvell_get_stat(struct phy_device *phydev, int i)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 65b0a3115e14cd99a44b9fefe015c1b6d829d4ac..43c82a87bc3a6418231048db43f4f11497a00d62 100644 (file)
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -2018,10 +2018,8 @@ static void kszphy_get_strings(struct phy_device *phydev, u8 *data)
 {
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) {
-               strscpy(data + i * ETH_GSTRING_LEN,
-                       kszphy_hw_stats[i].string, ETH_GSTRING_LEN);
-       }
+       for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++)
+               ethtool_puts(&data, kszphy_hw_stats[i].string);
 }
 
 static u64 kszphy_get_stat(struct phy_device *phydev, int i)

diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
index 6f74ce0ab1aad8a4a2d74b098a1625658d997824..bee381200ab85c6d6b69bb98e0df1dc59af21c14 100644 (file)
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
@@ -139,8 +139,7 @@ static void vsc85xx_get_strings(struct phy_device *phydev, u8 *data)
                return;
 
        for (i = 0; i < priv->nstats; i++)
-               strscpy(data + i * ETH_GSTRING_LEN, priv->hw_stats[i].string,
-                       ETH_GSTRING_LEN);
+               ethtool_puts(&data, priv->hw_stats[i].string);
 }
 
 static u64 vsc85xx_get_stat(struct phy_device *phydev, int i)

diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c
index 7e328c2a29a49f9e037a830430629083176f4f9b..ade544bc007d25278b74643e7f6f2183c4c8b124 100644 (file)
--- a/drivers/net/phy/nxp-c45-tja11xx.c
+++ b/drivers/net/phy/nxp-c45-tja11xx.c
@@ -1140,13 +1140,11 @@ static void nxp_c45_get_strings(struct phy_device *phydev, u8 *data)
 
        for (i = 0; i < count; i++) {
                if (i < ARRAY_SIZE(common_hw_stats)) {
-                       strscpy(data + i * ETH_GSTRING_LEN,
-                               common_hw_stats[i].name, ETH_GSTRING_LEN);
+                       ethtool_puts(&data, common_hw_stats[i].name);
                        continue;
                }
                idx = i - ARRAY_SIZE(common_hw_stats);
-               strscpy(data + i * ETH_GSTRING_LEN,
-                       phy_data->stats[idx].name, ETH_GSTRING_LEN);
+               ethtool_puts(&data, phy_data->stats[idx].name);
        }
 }
 

diff --git a/drivers/net/phy/nxp-cbtx.c b/drivers/net/phy/nxp-cbtx.c
index 145703f0a406e15c67f75c6951c57315fdf17143..3d25491043a3c13d641848c90c06913b7c49a838 100644 (file)
--- a/drivers/net/phy/nxp-cbtx.c
+++ b/drivers/net/phy/nxp-cbtx.c
@@ -182,7 +182,7 @@ static int cbtx_get_sset_count(struct phy_device *phydev)
 
 static void cbtx_get_strings(struct phy_device *phydev, u8 *data)
 {
-       strncpy(data, "100btx_rx_err", ETH_GSTRING_LEN);
+       ethtool_puts(&data, "100btx_rx_err");
 }
 
 static void cbtx_get_stats(struct phy_device *phydev,

diff --git a/drivers/net/phy/qcom/qca83xx.c b/drivers/net/phy/qcom/qca83xx.c
index a05d0df6fa16b8860031be38abf5e724617e320a..7a5039920b9f4c75e6a17d58a8a97c9f24717267 100644 (file)
--- a/drivers/net/phy/qcom/qca83xx.c
+++ b/drivers/net/phy/qcom/qca83xx.c
@@ -42,10 +42,8 @@ static void qca83xx_get_strings(struct phy_device *phydev, u8 *data)
 {
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) {
-               strscpy(data + i * ETH_GSTRING_LEN,
-                       qca83xx_hw_stats[i].string, ETH_GSTRING_LEN);
-       }
+       for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++)
+               ethtool_puts(&data, qca83xx_hw_stats[i].string);
 }
 
 static u64 qca83xx_get_stat(struct phy_device *phydev, int i)