Commit 7aa1402e authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

net: ethernet/sfc: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Solarflare linux maintainers <linux-net-drivers@solarflare.com>
Cc: Edward Cree <ecree@solarflare.com>
Cc: Bert Kenward <bkenward@solarflare.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarBert Kenward <bkenward@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc8bcaa0

drivers/net/ethernet/sfc/efx.c

+2 −4
Original line number Diff line number Diff line
@@ -471,8 +471,7 @@ efx_alloc_channel(struct efx_nic *efx, int i, struct efx_channel *old_channel) 


	rx_queue = &channel->rx_queue;

	rx_queue->efx = efx;

	setup_timer(&rx_queue->slow_fill, efx_rx_slow_fill,

		    (unsigned long)rx_queue);

	timer_setup(&rx_queue->slow_fill, efx_rx_slow_fill, 0);



	return channel;

}
@@ -511,8 +510,7 @@ efx_copy_channel(const struct efx_channel *old_channel) 
	rx_queue = &channel->rx_queue;

	rx_queue->buffer = NULL;

	memset(&rx_queue->rxd, 0, sizeof(rx_queue->rxd));

	setup_timer(&rx_queue->slow_fill, efx_rx_slow_fill,

		    (unsigned long)rx_queue);

	timer_setup(&rx_queue->slow_fill, efx_rx_slow_fill, 0);



	return channel;

}

drivers/net/ethernet/sfc/efx.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void efx_remove_rx_queue(struct efx_rx_queue *rx_queue); 
void efx_init_rx_queue(struct efx_rx_queue *rx_queue);

void efx_fini_rx_queue(struct efx_rx_queue *rx_queue);

void efx_fast_push_rx_descriptors(struct efx_rx_queue *rx_queue, bool atomic);

void efx_rx_slow_fill(unsigned long context);

void efx_rx_slow_fill(struct timer_list *t);

void __efx_rx_packet(struct efx_channel *channel);

void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,

		   unsigned int n_frags, unsigned int len, u16 flags);

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

+2 −4
Original line number Diff line number Diff line
@@ -449,8 +449,7 @@ ef4_alloc_channel(struct ef4_nic *efx, int i, struct ef4_channel *old_channel) 


	rx_queue = &channel->rx_queue;

	rx_queue->efx = efx;

	setup_timer(&rx_queue->slow_fill, ef4_rx_slow_fill,

		    (unsigned long)rx_queue);

	timer_setup(&rx_queue->slow_fill, ef4_rx_slow_fill, 0);



	return channel;

}
@@ -489,8 +488,7 @@ ef4_copy_channel(const struct ef4_channel *old_channel) 
	rx_queue = &channel->rx_queue;

	rx_queue->buffer = NULL;

	memset(&rx_queue->rxd, 0, sizeof(rx_queue->rxd));

	setup_timer(&rx_queue->slow_fill, ef4_rx_slow_fill,

		    (unsigned long)rx_queue);

	timer_setup(&rx_queue->slow_fill, ef4_rx_slow_fill, 0);



	return channel;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void ef4_remove_rx_queue(struct ef4_rx_queue *rx_queue); 
void ef4_init_rx_queue(struct ef4_rx_queue *rx_queue);

void ef4_fini_rx_queue(struct ef4_rx_queue *rx_queue);

void ef4_fast_push_rx_descriptors(struct ef4_rx_queue *rx_queue, bool atomic);

void ef4_rx_slow_fill(unsigned long context);

void ef4_rx_slow_fill(struct timer_list *t);

void __ef4_rx_packet(struct ef4_channel *channel);

void ef4_rx_packet(struct ef4_rx_queue *rx_queue, unsigned int index,

		   unsigned int n_frags, unsigned int len, u16 flags);

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

+6 −5
Original line number Diff line number Diff line
@@ -1454,10 +1454,11 @@ static void falcon_stats_complete(struct ef4_nic *efx) 
	}

}



static void falcon_stats_timer_func(unsigned long context)

static void falcon_stats_timer_func(struct timer_list *t)

{

	struct ef4_nic *efx = (struct ef4_nic *)context;

	struct falcon_nic_data *nic_data = efx->nic_data;

	struct falcon_nic_data *nic_data = from_timer(nic_data, t,

						      stats_timer);

	struct ef4_nic *efx = nic_data->efx;



	spin_lock(&efx->stats_lock);
@@ -2295,6 +2296,7 @@ static int falcon_probe_nic(struct ef4_nic *efx) 
	if (!nic_data)

		return -ENOMEM;

	efx->nic_data = nic_data;

	nic_data->efx = efx;



	rc = -ENODEV;
@@ -2402,8 +2404,7 @@ static int falcon_probe_nic(struct ef4_nic *efx) 
	}



	nic_data->stats_disable_count = 1;

	setup_timer(&nic_data->stats_timer, &falcon_stats_timer_func,

		    (unsigned long)efx);

	timer_setup(&nic_data->stats_timer, falcon_stats_timer_func, 0);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE