From: Alexander Duyck <alexander.duyck@gmail.com>
To: kuba@kernel.org
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
simon.horman@netronome.com, yisen.zhuang@huawei.com,
salil.mehta@huawei.com, intel-wired-lan@lists.osuosl.org,
jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com,
drivers@pensando.io, snelson@pensando.io, netanel@amazon.com,
akiyano@amazon.com, gtzalik@amazon.com, saeedb@amazon.com,
GR-Linux-NIC-Dev@marvell.com, skalluru@marvell.com,
rmody@marvell.com, kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, wei.liu@kernel.org, mst@redhat.com,
jasowang@redhat.com, pv-drivers@vmware.com, doshir@vmware.com,
alexanderduyck@fb.com
Subject: [RFC PATCH 05/10] ena: Update driver to use ethtool_gsprintf
Date: Wed, 10 Mar 2021 17:35:45 -0800 [thread overview]
Message-ID: <161542654541.13546.817443057977441498.stgit@localhost.localdomain> (raw)
In-Reply-To: <161542634192.13546.4185974647834631704.stgit@localhost.localdomain>
From: Alexander Duyck <alexanderduyck@fb.com>
Replace instances of snprintf or memcpy with a pointer update with
ethtool_gsprintf.
Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
---
drivers/net/ethernet/amazon/ena/ena_ethtool.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index d6cc7aa612b7..42f6bad7ca26 100644
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -251,10 +251,10 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)
for (j = 0; j < ENA_STATS_ARRAY_TX; j++) {
ena_stats = &ena_stats_tx_strings[j];
- snprintf(*data, ETH_GSTRING_LEN,
- "queue_%u_%s_%s", i,
- is_xdp ? "xdp_tx" : "tx", ena_stats->name);
- (*data) += ETH_GSTRING_LEN;
+ ethtool_gsprintf(data,
+ "queue_%u_%s_%s", i,
+ is_xdp ? "xdp_tx" : "tx",
+ ena_stats->name);
}
if (!is_xdp) {
@@ -264,9 +264,9 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)
for (j = 0; j < ENA_STATS_ARRAY_RX; j++) {
ena_stats = &ena_stats_rx_strings[j];
- snprintf(*data, ETH_GSTRING_LEN,
- "queue_%u_rx_%s", i, ena_stats->name);
- (*data) += ETH_GSTRING_LEN;
+ ethtool_gsprintf(data,
+ "queue_%u_rx_%s", i,
+ ena_stats->name);
}
}
}
@@ -280,9 +280,8 @@ static void ena_com_dev_strings(u8 **data)
for (i = 0; i < ENA_STATS_ARRAY_ENA_COM; i++) {
ena_stats = &ena_stats_ena_com_strings[i];
- snprintf(*data, ETH_GSTRING_LEN,
- "ena_admin_q_%s", ena_stats->name);
- (*data) += ETH_GSTRING_LEN;
+ ethtool_gsprintf(data,
+ "ena_admin_q_%s", ena_stats->name);
}
}
@@ -295,15 +294,13 @@ static void ena_get_strings(struct ena_adapter *adapter,
for (i = 0; i < ENA_STATS_ARRAY_GLOBAL; i++) {
ena_stats = &ena_stats_global_strings[i];
- memcpy(data, ena_stats->name, ETH_GSTRING_LEN);
- data += ETH_GSTRING_LEN;
+ ethtool_gsprintf(&data, ena_stats->name);
}
if (eni_stats_needed) {
for (i = 0; i < ENA_STATS_ARRAY_ENI(adapter); i++) {
ena_stats = &ena_stats_eni_strings[i];
- memcpy(data, ena_stats->name, ETH_GSTRING_LEN);
- data += ETH_GSTRING_LEN;
+ ethtool_gsprintf(&data, ena_stats->name);
}
}
next prev parent reply other threads:[~2021-03-11 1:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 1:35 [RFC PATCH 00/10] ethtool: Factor out common code related to writing ethtool strings Alexander Duyck
2021-03-11 1:35 ` [RFC PATCH 01/10] ethtool: Add common function for filling out strings Alexander Duyck
2021-03-11 2:08 ` Jakub Kicinski
2021-03-11 20:37 ` Jesse Brandeburg
2021-03-11 1:35 ` [RFC PATCH 02/10] intel: Update drivers to use ethtool_gsprintf Alexander Duyck
2021-03-11 20:32 ` Jesse Brandeburg
2021-03-11 1:35 ` [RFC PATCH 03/10] nfp: Replace nfp_pr_et with ethtool_gsprintf Alexander Duyck
2021-03-11 11:51 ` Simon Horman
2021-03-11 1:35 ` [RFC PATCH 04/10] hisilicon: Update drivers to use ethtool_gsprintf Alexander Duyck
2021-03-11 1:35 ` Alexander Duyck [this message]
2021-03-11 13:42 ` [RFC PATCH 05/10] ena: Update driver " Kiyanovski, Arthur
2021-03-11 1:35 ` [RFC PATCH 06/10] netvsc: " Alexander Duyck
2021-03-11 1:35 ` [RFC PATCH 07/10] virtio_net: " Alexander Duyck
2021-03-11 1:36 ` [RFC PATCH 08/10] vmxnet3: " Alexander Duyck
2021-03-11 1:36 ` [RFC PATCH 09/10] bna: " Alexander Duyck
2021-03-11 1:36 ` [RFC PATCH 10/10] ionic: " Alexander Duyck
2021-03-11 17:19 ` Shannon Nelson
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=161542654541.13546.817443057977441498.stgit@localhost.localdomain \
--to=alexander.duyck@gmail.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=akiyano@amazon.com \
--cc=alexanderduyck@fb.com \
--cc=anthony.l.nguyen@intel.com \
--cc=doshir@vmware.com \
--cc=drivers@pensando.io \
--cc=gtzalik@amazon.com \
--cc=haiyangz@microsoft.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jasowang@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=mst@redhat.com \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=pv-drivers@vmware.com \
--cc=rmody@marvell.com \
--cc=saeedb@amazon.com \
--cc=salil.mehta@huawei.com \
--cc=simon.horman@netronome.com \
--cc=skalluru@marvell.com \
--cc=snelson@pensando.io \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@kernel.org \
--cc=yisen.zhuang@huawei.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