Commit efbbe4fb authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

ena: Update driver to use ethtool_sprintf

Replace instances of snprintf or memcpy with a pointer update with
ethtool_sprintf.
Acked-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83cd2397
...@@ -251,10 +251,10 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data) ...@@ -251,10 +251,10 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)
for (j = 0; j < ENA_STATS_ARRAY_TX; j++) { for (j = 0; j < ENA_STATS_ARRAY_TX; j++) {
ena_stats = &ena_stats_tx_strings[j]; ena_stats = &ena_stats_tx_strings[j];
snprintf(*data, ETH_GSTRING_LEN, ethtool_sprintf(data,
"queue_%u_%s_%s", i, "queue_%u_%s_%s", i,
is_xdp ? "xdp_tx" : "tx", ena_stats->name); is_xdp ? "xdp_tx" : "tx",
(*data) += ETH_GSTRING_LEN; ena_stats->name);
} }
if (!is_xdp) { if (!is_xdp) {
...@@ -264,9 +264,9 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data) ...@@ -264,9 +264,9 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)
for (j = 0; j < ENA_STATS_ARRAY_RX; j++) { for (j = 0; j < ENA_STATS_ARRAY_RX; j++) {
ena_stats = &ena_stats_rx_strings[j]; ena_stats = &ena_stats_rx_strings[j];
snprintf(*data, ETH_GSTRING_LEN, ethtool_sprintf(data,
"queue_%u_rx_%s", i, ena_stats->name); "queue_%u_rx_%s", i,
(*data) += ETH_GSTRING_LEN; ena_stats->name);
} }
} }
} }
...@@ -280,9 +280,8 @@ static void ena_com_dev_strings(u8 **data) ...@@ -280,9 +280,8 @@ static void ena_com_dev_strings(u8 **data)
for (i = 0; i < ENA_STATS_ARRAY_ENA_COM; i++) { for (i = 0; i < ENA_STATS_ARRAY_ENA_COM; i++) {
ena_stats = &ena_stats_ena_com_strings[i]; ena_stats = &ena_stats_ena_com_strings[i];
snprintf(*data, ETH_GSTRING_LEN, ethtool_sprintf(data,
"ena_admin_q_%s", ena_stats->name); "ena_admin_q_%s", ena_stats->name);
(*data) += ETH_GSTRING_LEN;
} }
} }
...@@ -295,15 +294,13 @@ static void ena_get_strings(struct ena_adapter *adapter, ...@@ -295,15 +294,13 @@ static void ena_get_strings(struct ena_adapter *adapter,
for (i = 0; i < ENA_STATS_ARRAY_GLOBAL; i++) { for (i = 0; i < ENA_STATS_ARRAY_GLOBAL; i++) {
ena_stats = &ena_stats_global_strings[i]; ena_stats = &ena_stats_global_strings[i];
memcpy(data, ena_stats->name, ETH_GSTRING_LEN); ethtool_sprintf(&data, ena_stats->name);
data += ETH_GSTRING_LEN;
} }
if (eni_stats_needed) { if (eni_stats_needed) {
for (i = 0; i < ENA_STATS_ARRAY_ENI(adapter); i++) { for (i = 0; i < ENA_STATS_ARRAY_ENI(adapter); i++) {
ena_stats = &ena_stats_eni_strings[i]; ena_stats = &ena_stats_eni_strings[i];
memcpy(data, ena_stats->name, ETH_GSTRING_LEN); ethtool_sprintf(&data, ena_stats->name);
data += ETH_GSTRING_LEN;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment