Commit 33d005b2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'a-pile-of-sfc-deadcode' 



Dr. David Alan Gilbert says:

====================
A pile of sfc deadcode

This is a collection of deadcode removal in the sfc
drivers;  the split is vaguely where I found them in
the tree, with some left over.

This has been build tested and booted on an x86 VM,
but I fon't have the hardware to test; however
it's all full function removal.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
====================

Link: https://patch.msgid.link/20241102151625.39535-1-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 84bfbfbb d3e80070

drivers/net/ethernet/sfc/efx.c

+0 −8
Original line number Diff line number Diff line
@@ -418,14 +418,6 @@ unsigned int efx_usecs_to_ticks(struct efx_nic *efx, unsigned int usecs) 
	return usecs * 1000 / efx->timer_quantum_ns;

}



unsigned int efx_ticks_to_usecs(struct efx_nic *efx, unsigned int ticks)

{

	/* We must round up when converting ticks to microseconds

	 * because we round down when converting the other way.

	 */

	return DIV_ROUND_UP(ticks * efx->timer_quantum_ns, 1000);

}



/* Set interrupt moderation parameters */

int efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,

			    unsigned int rx_usecs, bool rx_adaptive,

drivers/net/ethernet/sfc/efx.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ extern const struct ethtool_ops efx_ethtool_ops; 


/* Global */

unsigned int efx_usecs_to_ticks(struct efx_nic *efx, unsigned int usecs);

unsigned int efx_ticks_to_usecs(struct efx_nic *efx, unsigned int ticks);

int efx_init_irq_moderation(struct efx_nic *efx, unsigned int tx_usecs,

			    unsigned int rx_usecs, bool rx_adaptive,

			    bool rx_may_override_tx);

drivers/net/ethernet/sfc/efx_common.c

+0 −16
Original line number Diff line number Diff line
@@ -635,22 +635,6 @@ int __efx_reconfigure_port(struct efx_nic *efx) 
	return rc;

}



/* Reinitialise the MAC to pick up new PHY settings, even if the port is

 * disabled.

 */

int efx_reconfigure_port(struct efx_nic *efx)

{

	int rc;



	EFX_ASSERT_RESET_SERIALISED(efx);



	mutex_lock(&efx->mac_lock);

	rc = __efx_reconfigure_port(efx);

	mutex_unlock(&efx->mac_lock);



	return rc;

}



/**************************************************************************

 *

 * Device reset and suspend

drivers/net/ethernet/sfc/efx_common.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ void efx_destroy_reset_workqueue(void); 
void efx_start_monitor(struct efx_nic *efx);



int __efx_reconfigure_port(struct efx_nic *efx);

int efx_reconfigure_port(struct efx_nic *efx);



#define EFX_ASSERT_RESET_SERIALISED(efx)				\

	do {								\

drivers/net/ethernet/sfc/falcon/efx.c

+0 −8
Original line number Diff line number Diff line
@@ -1886,14 +1886,6 @@ unsigned int ef4_usecs_to_ticks(struct ef4_nic *efx, unsigned int usecs) 
	return usecs * 1000 / efx->timer_quantum_ns;

}



unsigned int ef4_ticks_to_usecs(struct ef4_nic *efx, unsigned int ticks)

{

	/* We must round up when converting ticks to microseconds

	 * because we round down when converting the other way.

	 */

	return DIV_ROUND_UP(ticks * efx->timer_quantum_ns, 1000);

}



/* Set interrupt moderation parameters */

int ef4_init_irq_moderation(struct ef4_nic *efx, unsigned int tx_usecs,

			    unsigned int rx_usecs, bool rx_adaptive,