aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-12-11 12:34:34 +0100
committerThomas Gleixner <tglx@linutronix.de>2010-12-11 12:34:34 +0100
commit45f74264e18449cf3c93cccaf098ee6e9524ab78 (patch)
treed5208559825ea479dce08df7658f0590aabea43b
parenthrtimer: fix timerqueue conversion flub (diff)
downloadlinux-dev-45f74264e18449cf3c93cccaf098ee6e9524ab78.tar.xz
linux-dev-45f74264e18449cf3c93cccaf098ee6e9524ab78.zip
timerqueue: Make timerqueue_getnext() static inline
No point in calling a function just to dereference a pointer. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org>
-rw-r--r--include/linux/timerqueue.h15
-rw-r--r--lib/timerqueue.c14
2 files changed, 14 insertions, 15 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
index 406b103894bd..d24aabaca474 100644
--- a/include/linux/timerqueue.h
+++ b/include/linux/timerqueue.h
@@ -20,10 +20,23 @@ extern void timerqueue_add(struct timerqueue_head *head,
struct timerqueue_node *node);
extern void timerqueue_del(struct timerqueue_head *head,
struct timerqueue_node *node);
-extern struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head);
extern struct timerqueue_node *timerqueue_iterate_next(
struct timerqueue_node *node);
+/**
+ * timerqueue_getnext - Returns the timer with the earlies expiration time
+ *
+ * @head: head of timerqueue
+ *
+ * Returns a pointer to the timer node that has the
+ * earliest expiration time.
+ */
+static inline
+struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head)
+{
+ return head->next;
+}
+
static inline void timerqueue_init(struct timerqueue_node *node)
{
RB_CLEAR_NODE(&node->node);
diff --git a/lib/timerqueue.c b/lib/timerqueue.c
index 444b0934af92..e3a1050e6820 100644
--- a/lib/timerqueue.c
+++ b/lib/timerqueue.c
@@ -85,20 +85,6 @@ void timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node)
EXPORT_SYMBOL_GPL(timerqueue_del);
/**
- * timerqueue_getnext - Returns the timer with the earlies expiration time
- *
- * @head: head of timerqueue
- *
- * Returns a pointer to the timer node that has the
- * earliest expiration time.
- */
-struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head)
-{
- return head->next;
-}
-EXPORT_SYMBOL_GPL(timerqueue_getnext);
-
-/**
* timerqueue_iterate_next - Returns the timer after the provided timer
*
* @node: Pointer to a timer.