Commit fb604576 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'converge-on-using-secs_to_jiffies-part-two' 

Easwar Hariharan says:

====================
Converge on using secs_to_jiffies() part two

This is the second series (part 1*) that converts users of msecs_to_jiffies() that
either use the multiply pattern of either of:
- msecs_to_jiffies(N*1000) or
- msecs_to_jiffies(N*MSEC_PER_SEC)

where N is a constant or an expression, to avoid the multiplication.

The conversion is made with Coccinelle with the secs_to_jiffies() script
in scripts/coccinelle/misc. Attention is paid to what the best change
can be rather than restricting to what the tool provides.

v1: https://lore.kernel.org/20250219-netdev-secs-to-jiffies-part-2-v1-0-c484cc63611b@linux.microsoft.com
====================

Link: https://patch.msgid.link/20250707-netdev-secs-to-jiffies-part-2-v2-0-b7817036342f@linux.microsoft.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d991666b 31326d98

net/ipv4/ipconfig.c

+3 −3
Original line number Diff line number Diff line
@@ -274,9 +274,9 @@ static int __init ic_open_devs(void) 


	/* wait for a carrier on at least one device */

	start = jiffies;

	next_msg = start + msecs_to_jiffies(20000);

	next_msg = start + secs_to_jiffies(20);

	while (time_before(jiffies, start +

			   msecs_to_jiffies(carrier_timeout * 1000))) {

			   secs_to_jiffies(carrier_timeout))) {

		int wait, elapsed;



		rtnl_lock();
@@ -295,7 +295,7 @@ static int __init ic_open_devs(void) 
		elapsed = jiffies_to_msecs(jiffies - start);

		wait = (carrier_timeout * 1000 - elapsed + 500) / 1000;

		pr_info("Waiting up to %d more seconds for network.\n", wait);

		next_msg = jiffies + msecs_to_jiffies(20000);

		next_msg = jiffies + secs_to_jiffies(20);

	}

have_carrier:

net/smc/af_smc.c

+1 −2
Original line number Diff line number Diff line
@@ -2735,8 +2735,7 @@ int smc_accept(struct socket *sock, struct socket *new_sock, 


	if (lsmc->sockopt_defer_accept && !(arg->flags & O_NONBLOCK)) {

		/* wait till data arrives on the socket */

		timeo = msecs_to_jiffies(lsmc->sockopt_defer_accept *

								MSEC_PER_SEC);

		timeo = secs_to_jiffies(lsmc->sockopt_defer_accept);

		if (smc_sk(nsk)->use_fallback) {

			struct sock *clcsk = smc_sk(nsk)->clcsock->sk;