From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Rosen Penev <rosenp@gmail.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net-next] net: fjes: use ethtool string helpers
Date: Tue, 22 Oct 2024 13:54:31 -0700 [thread overview]
Message-ID: <20241022205431.511859-1-rosenp@gmail.com> (raw)
The latter is the preferred way to copy ethtool strings.
Avoids manually incrementing the pointer.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/fjes/fjes_ethtool.c | 50 +++++++++++----------------------
1 file changed, 17 insertions(+), 33 deletions(-)
diff --git a/drivers/net/fjes/fjes_ethtool.c b/drivers/net/fjes/fjes_ethtool.c
index 19c99529566b..1dc7754e0f1f 100644
--- a/drivers/net/fjes/fjes_ethtool.c
+++ b/drivers/net/fjes/fjes_ethtool.c
@@ -92,42 +92,26 @@ static void fjes_get_strings(struct net_device *netdev,
switch (stringset) {
case ETH_SS_STATS:
- for (i = 0; i < ARRAY_SIZE(fjes_gstrings_stats); i++) {
- memcpy(p, fjes_gstrings_stats[i].stat_string,
- ETH_GSTRING_LEN);
- p += ETH_GSTRING_LEN;
- }
+ for (i = 0; i < ARRAY_SIZE(fjes_gstrings_stats); i++)
+ ethtool_puts(&p, fjes_gstrings_stats[i].stat_string);
+
for (i = 0; i < hw->max_epid; i++) {
if (i == hw->my_epid)
continue;
- sprintf(p, "ep%u_com_regist_buf_exec", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_com_unregist_buf_exec", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_send_intr_rx", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_send_intr_unshare", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_send_intr_zoneupdate", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_recv_intr_rx", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_recv_intr_unshare", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_recv_intr_stop", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_recv_intr_zoneupdate", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_tx_buffer_full", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_tx_dropped_not_shared", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_tx_dropped_ver_mismatch", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_tx_dropped_buf_size_mismatch", i);
- p += ETH_GSTRING_LEN;
- sprintf(p, "ep%u_tx_dropped_vlanid_mismatch", i);
- p += ETH_GSTRING_LEN;
+ ethtool_sprintf(&p, "ep%u_com_regist_buf_exec", i);
+ ethtool_sprintf(&p, "ep%u_com_unregist_buf_exec", i);
+ ethtool_sprintf(&p, "ep%u_send_intr_rx", i);
+ ethtool_sprintf(&p, "ep%u_send_intr_unshare", i);
+ ethtool_sprintf(&p, "ep%u_send_intr_zoneupdate", i);
+ ethtool_sprintf(&p, "ep%u_recv_intr_rx", i);
+ ethtool_sprintf(&p, "ep%u_recv_intr_unshare", i);
+ ethtool_sprintf(&p, "ep%u_recv_intr_stop", i);
+ ethtool_sprintf(&p, "ep%u_recv_intr_zoneupdate", i);
+ ethtool_sprintf(&p, "ep%u_tx_buffer_full", i);
+ ethtool_sprintf(&p, "ep%u_tx_dropped_not_shared", i);
+ ethtool_sprintf(&p, "ep%u_tx_dropped_ver_mismatch", i);
+ ethtool_sprintf(&p, "ep%u_tx_dropped_buf_size_mismatch", i);
+ ethtool_sprintf(&p, "ep%u_tx_dropped_vlanid_mismatch", i);
}
break;
}
--
2.47.0
next reply other threads:[~2024-10-22 20:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 20:54 Rosen Penev [this message]
2024-10-24 11:03 ` Simon Horman
2024-10-29 22:55 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241022205431.511859-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®