aboutsummaryrefslogtreecommitdiff
path: root/include/linux/timerqueue.h
diff options
context:
space:
mode:
authorDmitry Torokhov <[email protected]>2024-07-15 15:50:05 -0700
committerDmitry Torokhov <[email protected]>2024-07-15 15:50:05 -0700
commit3daee2e4b3568f0ed88b0598df96547fcf21cb9b (patch)
tree19f47d0d4d3ff05266a25364959f0012a1825131 /include/linux/timerqueue.h
parentf3efefb6fdcce604413135bd8d4c5568e53a1f13 (diff)
parent0c3836482481200ead7b416ca80c68a29cfdaabd (diff)
Merge tag 'v6.10' into next
Sync up with mainline to bring in device_for_each_child_node_scoped() and other newer APIs.
Diffstat (limited to 'include/linux/timerqueue.h')
-rw-r--r--include/linux/timerqueue.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
index 62973f7d4610..d306d9dd2207 100644
--- a/include/linux/timerqueue.h
+++ b/include/linux/timerqueue.h
@@ -37,11 +37,6 @@ static inline bool timerqueue_node_queued(struct timerqueue_node *node)
return !RB_EMPTY_NODE(&node->node);
}
-static inline bool timerqueue_node_expires(struct timerqueue_node *node)
-{
- return node->expires;
-}
-
static inline void timerqueue_init_head(struct timerqueue_head *head)
{
head->rb_root = RB_ROOT_CACHED;