tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Rosen Penev and committed by
Jakub Kicinski 1441df3a 69cb0b97

+15 -29
+2 -4
drivers/net/phy/adin.c
··· 801 801 { 802 802 int i; 803 803 804 - for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) { 805 - strscpy(&data[i * ETH_GSTRING_LEN], 806 - adin_hw_stats[i].string, ETH_GSTRING_LEN); 807 - } 804 + for (i = 0; i < ARRAY_SIZE(adin_hw_stats); i++) 805 + ethtool_puts(&data, adin_hw_stats[i].string); 808 806 } 809 807 810 808 static int adin_read_mmd_stat_regs(struct phy_device *phydev,
+1 -2
drivers/net/phy/icplus.c
··· 540 540 int i; 541 541 542 542 for (i = 0; i < ARRAY_SIZE(ip101g_hw_stats); i++) 543 - strscpy(data + i * ETH_GSTRING_LEN, 544 - ip101g_hw_stats[i].name, ETH_GSTRING_LEN); 543 + ethtool_puts(&data, ip101g_hw_stats[i].name); 545 544 } 546 545 547 546 static u64 ip101g_get_stat(struct phy_device *phydev, int i)
+4 -8
drivers/net/phy/marvell.c
··· 2020 2020 int count = marvell_get_sset_count(phydev); 2021 2021 int i; 2022 2022 2023 - for (i = 0; i < count; i++) { 2024 - strscpy(data + i * ETH_GSTRING_LEN, 2025 - marvell_hw_stats[i].string, ETH_GSTRING_LEN); 2026 - } 2023 + for (i = 0; i < count; i++) 2024 + ethtool_puts(&data, marvell_hw_stats[i].string); 2027 2025 } 2028 2026 2029 2027 static void marvell_get_strings_simple(struct phy_device *phydev, u8 *data) ··· 2029 2031 int count = marvell_get_sset_count_simple(phydev); 2030 2032 int i; 2031 2033 2032 - for (i = 0; i < count; i++) { 2033 - strscpy(data + i * ETH_GSTRING_LEN, 2034 - marvell_hw_stats_simple[i].string, ETH_GSTRING_LEN); 2035 - } 2034 + for (i = 0; i < count; i++) 2035 + ethtool_puts(&data, marvell_hw_stats_simple[i].string); 2036 2036 } 2037 2037 2038 2038 static u64 marvell_get_stat(struct phy_device *phydev, int i)
+2 -4
drivers/net/phy/micrel.c
··· 2018 2018 { 2019 2019 int i; 2020 2020 2021 - for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) { 2022 - strscpy(data + i * ETH_GSTRING_LEN, 2023 - kszphy_hw_stats[i].string, ETH_GSTRING_LEN); 2024 - } 2021 + for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) 2022 + ethtool_puts(&data, kszphy_hw_stats[i].string); 2025 2023 } 2026 2024 2027 2025 static u64 kszphy_get_stat(struct phy_device *phydev, int i)
+1 -2
drivers/net/phy/mscc/mscc_main.c
··· 139 139 return; 140 140 141 141 for (i = 0; i < priv->nstats; i++) 142 - strscpy(data + i * ETH_GSTRING_LEN, priv->hw_stats[i].string, 143 - ETH_GSTRING_LEN); 142 + ethtool_puts(&data, priv->hw_stats[i].string); 144 143 } 145 144 146 145 static u64 vsc85xx_get_stat(struct phy_device *phydev, int i)
+2 -4
drivers/net/phy/nxp-c45-tja11xx.c
··· 1140 1140 1141 1141 for (i = 0; i < count; i++) { 1142 1142 if (i < ARRAY_SIZE(common_hw_stats)) { 1143 - strscpy(data + i * ETH_GSTRING_LEN, 1144 - common_hw_stats[i].name, ETH_GSTRING_LEN); 1143 + ethtool_puts(&data, common_hw_stats[i].name); 1145 1144 continue; 1146 1145 } 1147 1146 idx = i - ARRAY_SIZE(common_hw_stats); 1148 - strscpy(data + i * ETH_GSTRING_LEN, 1149 - phy_data->stats[idx].name, ETH_GSTRING_LEN); 1147 + ethtool_puts(&data, phy_data->stats[idx].name); 1150 1148 } 1151 1149 } 1152 1150
+1 -1
drivers/net/phy/nxp-cbtx.c
··· 182 182 183 183 static void cbtx_get_strings(struct phy_device *phydev, u8 *data) 184 184 { 185 - strncpy(data, "100btx_rx_err", ETH_GSTRING_LEN); 185 + ethtool_puts(&data, "100btx_rx_err"); 186 186 } 187 187 188 188 static void cbtx_get_stats(struct phy_device *phydev,
+2 -4
drivers/net/phy/qcom/qca83xx.c
··· 42 42 { 43 43 int i; 44 44 45 - for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) { 46 - strscpy(data + i * ETH_GSTRING_LEN, 47 - qca83xx_hw_stats[i].string, ETH_GSTRING_LEN); 48 - } 45 + for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) 46 + ethtool_puts(&data, qca83xx_hw_stats[i].string); 49 47 } 50 48 51 49 static u64 qca83xx_get_stat(struct phy_device *phydev, int i)