Commit 734ff310 authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Jakub Kicinski
Browse files

gve: Convert timeouts to secs_to_jiffies() 



Commit b35108a5 ("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies(). As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.

This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
the following Coccinelle rules:

@@ constant C; @@

- msecs_to_jiffies(C * 1000)
+ secs_to_jiffies(C)

@@ constant C; @@

- msecs_to_jiffies(C * MSEC_PER_SEC)
+ secs_to_jiffies(C)

Signed-off-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Reviewed-by: default avatarPraveen Kaligineedi <pkaligineedi@google.com>
Link: https://patch.msgid.link/20241212-netdev-converge-secs-to-jiffies-v4-1-6dac97a6d6ab@linux.microsoft.com


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

drivers/net/ethernet/google/gve/gve_tx_dqo.c

+2 −4
Original line number Diff line number Diff line
@@ -1146,8 +1146,7 @@ static void gve_handle_miss_completion(struct gve_priv *priv, 
	/* jiffies can wraparound but time comparisons can handle overflows. */

	pending_packet->timeout_jiffies =

			jiffies +

			msecs_to_jiffies(GVE_REINJECT_COMPL_TIMEOUT *

					 MSEC_PER_SEC);

			secs_to_jiffies(GVE_REINJECT_COMPL_TIMEOUT);

	add_to_list(tx, &tx->dqo_compl.miss_completions, pending_packet);



	*bytes += pending_packet->skb->len;
@@ -1191,8 +1190,7 @@ static void remove_miss_completions(struct gve_priv *priv, 
		pending_packet->state = GVE_PACKET_STATE_TIMED_OUT_COMPL;

		pending_packet->timeout_jiffies =

				jiffies +

				msecs_to_jiffies(GVE_DEALLOCATE_COMPL_TIMEOUT *

						 MSEC_PER_SEC);

				secs_to_jiffies(GVE_DEALLOCATE_COMPL_TIMEOUT);

		/* Maintain pending packet in another list so the packet can be

		 * unallocated at a later time.

		 */