net: ipconfig: convert timeouts to secs_to_jiffies()

Commit b35108a51cf7 ("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:

@depends on patch@
expression E;
@@

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

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

While here, manually convert a couple timeouts denominated in seconds

Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
Link: https://patch.msgid.link/20250707-netdev-secs-to-jiffies-part-2-v2-2-b7817036342f@linux.microsoft.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index c56b6fe6f0d771e9275bb66c159d9abb330bdf4c..22a7889876c1cf7d5233fe8a0ee12e134b20c1cd 100644 (file)
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -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: