Commit b35108a5 authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Thomas Gleixner
Browse files

jiffies: Define secs_to_jiffies() 



secs_to_jiffies() is defined in hci_event.c and cannot be reused by
other call sites. Hoist it into the core code to allow conversion of the
~1150 usages of msecs_to_jiffies() that either:

 - use a multiplier value of 1000 or equivalently MSEC_PER_SEC, or
 - have timeouts that are denominated in seconds (i.e. end in 000)

It's implemented as a macro to allow usage in static initializers.

This will also allow conversion of yet more sites that use (sec * HZ)
directly, and improve their readability.

Suggested-by: default avatarMichael Kelley <mhklinux@outlook.com>
Signed-off-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Link: https://lore.kernel.org/all/20241030-open-coded-timeouts-v3-1-9ba123facf88@linux.microsoft.com
parent 1550dde8

include/linux/jiffies.h

+13 −0
Original line number Diff line number Diff line
@@ -526,6 +526,19 @@ static __always_inline unsigned long msecs_to_jiffies(const unsigned int m) 
	}

}



/**

 * secs_to_jiffies: - convert seconds to jiffies

 * @_secs: time in seconds

 *

 * Conversion is done by simple multiplication with HZ

 *

 * secs_to_jiffies() is defined as a macro rather than a static inline

 * function so it can be used in static initializers.

 *

 * Return: jiffies value

 */

#define secs_to_jiffies(_secs) ((_secs) * HZ)



extern unsigned long __usecs_to_jiffies(const unsigned int u);

#if !(USEC_PER_SEC % HZ)

static inline unsigned long _usecs_to_jiffies(const unsigned int u)

net/bluetooth/hci_event.c

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
#define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \

		 "\x00\x00\x00\x00\x00\x00\x00\x00"



#define secs_to_jiffies(_secs) msecs_to_jiffies((_secs) * 1000)



/* Handle HCI Event packets */



static void *hci_ev_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,