Commit 5254fdfc authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jakub Kicinski
Browse files

sfc: Remove unused mcdi functions 



efx_mcdi_flush_rxqs(), efx_mcdi_rpc_async_quiet(),
efx_mcdi_rpc_finish_quiet(), and efx_mcdi_wol_filter_get_magic()
are unused.
I think these are fall out from the split into Siena
that happened in
commit 4d49e5cd ("sfc/siena: Rename functions in mcdi headers to avoid
conflicts with sfc")
and
commit d48523cb ("sfc: Copy shared files needed for Siena (part 2)")

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Acked-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Link: https://patch.msgid.link/20241102151625.39535-4-linux@treblig.org


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

drivers/net/ethernet/sfc/mcdi.c

+0 −76
Original line number Diff line number Diff line
@@ -1051,15 +1051,6 @@ efx_mcdi_rpc_async(struct efx_nic *efx, unsigned int cmd, 
				   cookie, false);

}



int efx_mcdi_rpc_async_quiet(struct efx_nic *efx, unsigned int cmd,

			     const efx_dword_t *inbuf, size_t inlen,

			     size_t outlen, efx_mcdi_async_completer *complete,

			     unsigned long cookie)

{

	return _efx_mcdi_rpc_async(efx, cmd, inbuf, inlen, outlen, complete,

				   cookie, true);

}



int efx_mcdi_rpc_finish(struct efx_nic *efx, unsigned cmd, size_t inlen,

			efx_dword_t *outbuf, size_t outlen,

			size_t *outlen_actual)
@@ -1068,14 +1059,6 @@ int efx_mcdi_rpc_finish(struct efx_nic *efx, unsigned cmd, size_t inlen, 
				    outlen_actual, false, NULL, NULL);

}



int efx_mcdi_rpc_finish_quiet(struct efx_nic *efx, unsigned cmd, size_t inlen,

			      efx_dword_t *outbuf, size_t outlen,

			      size_t *outlen_actual)

{

	return _efx_mcdi_rpc_finish(efx, cmd, inlen, outbuf, outlen,

				    outlen_actual, true, NULL, NULL);

}



void efx_mcdi_display_error(struct efx_nic *efx, unsigned cmd,

			    size_t inlen, efx_dword_t *outbuf,

			    size_t outlen, int rc)
@@ -1982,33 +1965,6 @@ efx_mcdi_wol_filter_set_magic(struct efx_nic *efx, const u8 *mac, int *id_out) 
}





int efx_mcdi_wol_filter_get_magic(struct efx_nic *efx, int *id_out)

{

	MCDI_DECLARE_BUF(outbuf, MC_CMD_WOL_FILTER_GET_OUT_LEN);

	size_t outlen;

	int rc;



	rc = efx_mcdi_rpc(efx, MC_CMD_WOL_FILTER_GET, NULL, 0,

			  outbuf, sizeof(outbuf), &outlen);

	if (rc)

		goto fail;



	if (outlen < MC_CMD_WOL_FILTER_GET_OUT_LEN) {

		rc = -EIO;

		goto fail;

	}



	*id_out = (int)MCDI_DWORD(outbuf, WOL_FILTER_GET_OUT_FILTER_ID);



	return 0;



fail:

	*id_out = -1;

	netif_err(efx, hw, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);

	return rc;

}





int efx_mcdi_wol_filter_remove(struct efx_nic *efx, int id)

{

	MCDI_DECLARE_BUF(inbuf, MC_CMD_WOL_FILTER_REMOVE_IN_LEN);
@@ -2021,38 +1977,6 @@ int efx_mcdi_wol_filter_remove(struct efx_nic *efx, int id) 
	return rc;

}



int efx_mcdi_flush_rxqs(struct efx_nic *efx)

{

	struct efx_channel *channel;

	struct efx_rx_queue *rx_queue;

	MCDI_DECLARE_BUF(inbuf,

			 MC_CMD_FLUSH_RX_QUEUES_IN_LEN(EFX_MAX_CHANNELS));

	int rc, count;



	BUILD_BUG_ON(EFX_MAX_CHANNELS >

		     MC_CMD_FLUSH_RX_QUEUES_IN_QID_OFST_MAXNUM);



	count = 0;

	efx_for_each_channel(channel, efx) {

		efx_for_each_channel_rx_queue(rx_queue, channel) {

			if (rx_queue->flush_pending) {

				rx_queue->flush_pending = false;

				atomic_dec(&efx->rxq_flush_pending);

				MCDI_SET_ARRAY_DWORD(

					inbuf, FLUSH_RX_QUEUES_IN_QID_OFST,

					count, efx_rx_queue_index(rx_queue));

				count++;

			}

		}

	}



	rc = efx_mcdi_rpc(efx, MC_CMD_FLUSH_RX_QUEUES, inbuf,

			  MC_CMD_FLUSH_RX_QUEUES_IN_LEN(count), NULL, 0, NULL);

	WARN_ON(rc < 0);



	return rc;

}



int efx_mcdi_wol_filter_reset(struct efx_nic *efx)

{

	int rc;

drivers/net/ethernet/sfc/mcdi.h

+0 −10
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ int efx_mcdi_rpc_start(struct efx_nic *efx, unsigned cmd, 
int efx_mcdi_rpc_finish(struct efx_nic *efx, unsigned cmd, size_t inlen,

			efx_dword_t *outbuf, size_t outlen,

			size_t *outlen_actual);

int efx_mcdi_rpc_finish_quiet(struct efx_nic *efx, unsigned cmd,

			      size_t inlen, efx_dword_t *outbuf,

			      size_t outlen, size_t *outlen_actual);



typedef void efx_mcdi_async_completer(struct efx_nic *efx,

				      unsigned long cookie, int rc,
@@ -167,11 +164,6 @@ int efx_mcdi_rpc_async(struct efx_nic *efx, unsigned int cmd, 
		       const efx_dword_t *inbuf, size_t inlen, size_t outlen,

		       efx_mcdi_async_completer *complete,

		       unsigned long cookie);

int efx_mcdi_rpc_async_quiet(struct efx_nic *efx, unsigned int cmd,

			     const efx_dword_t *inbuf, size_t inlen,

			     size_t outlen,

			     efx_mcdi_async_completer *complete,

			     unsigned long cookie);



void efx_mcdi_display_error(struct efx_nic *efx, unsigned cmd,

			    size_t inlen, efx_dword_t *outbuf,
@@ -410,10 +402,8 @@ int efx_mcdi_handle_assertion(struct efx_nic *efx); 
int efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode);

int efx_mcdi_wol_filter_set_magic(struct efx_nic *efx, const u8 *mac,

				  int *id_out);

int efx_mcdi_wol_filter_get_magic(struct efx_nic *efx, int *id_out);

int efx_mcdi_wol_filter_remove(struct efx_nic *efx, int id);

int efx_mcdi_wol_filter_reset(struct efx_nic *efx);

int efx_mcdi_flush_rxqs(struct efx_nic *efx);

void efx_mcdi_process_link_change(struct efx_nic *efx, efx_qword_t *ev);

void efx_mcdi_mac_start_stats(struct efx_nic *efx);

void efx_mcdi_mac_stop_stats(struct efx_nic *efx);