Commit dbb9a7ef authored by Rosen Penev's avatar Rosen Penev Committed by Jakub Kicinski
Browse files

net: fjes: use ethtool string helpers 



The latter is the preferred way to copy ethtool strings.

Avoids manually incrementing the pointer.

Signed-off-by: default avatarRosen Penev <rosenp@gmail.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241029232721.8442-1-rosenp@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bc74d329

drivers/net/fjes/fjes_ethtool.c

+23 −41
Original line number Diff line number Diff line
@@ -87,49 +87,31 @@ static void fjes_get_strings(struct net_device *netdev, 
{

	struct fjes_adapter *adapter = netdev_priv(netdev);

	struct fjes_hw *hw = &adapter->hw;

	u8 *p = data;

	int i;



	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;

		}

	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < ARRAY_SIZE(fjes_gstrings_stats); i++)

		ethtool_puts(&data, 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;

		}

		break;

		ethtool_sprintf(&data, "ep%u_com_regist_buf_exec", i);

		ethtool_sprintf(&data, "ep%u_com_unregist_buf_exec", i);

		ethtool_sprintf(&data, "ep%u_send_intr_rx", i);

		ethtool_sprintf(&data, "ep%u_send_intr_unshare", i);

		ethtool_sprintf(&data, "ep%u_send_intr_zoneupdate", i);

		ethtool_sprintf(&data, "ep%u_recv_intr_rx", i);

		ethtool_sprintf(&data, "ep%u_recv_intr_unshare", i);

		ethtool_sprintf(&data, "ep%u_recv_intr_stop", i);

		ethtool_sprintf(&data, "ep%u_recv_intr_zoneupdate", i);

		ethtool_sprintf(&data, "ep%u_tx_buffer_full", i);

		ethtool_sprintf(&data, "ep%u_tx_dropped_not_shared", i);

		ethtool_sprintf(&data, "ep%u_tx_dropped_ver_mismatch", i);

		ethtool_sprintf(&data, "ep%u_tx_dropped_buf_size_mismatch", i);

		ethtool_sprintf(&data, "ep%u_tx_dropped_vlanid_mismatch", i);

	}

}