Skip to content

Commit

Permalink
jiffies: Define secs_to_jiffies()
Browse files Browse the repository at this point in the history
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: Michael Kelley <[email protected]>
Signed-off-by: Easwar Hariharan <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Luiz Augusto von Dentz <[email protected]>
Link: https://lore.kernel.org/all/20241030-open-coded-timeouts-v3-1-9ba123facf88@linux.microsoft.com
  • Loading branch information
easwarh authored and KAGA-KOKO committed Oct 30, 2024
1 parent 1550dde commit b35108a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 13 additions & 0 deletions include/linux/jiffies.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit b35108a

Please sign in to comment.