tracing: Add ftrace_hash_key() helper function

Replace the couple of use cases that has small logic to produce the ftrace
function key id with a helper function. No need for duplicate code.

Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 2d554a02241de414387100e77bd2aad72a58ad6b..89240f62061ce119612a562dcc7540bb9bf78444 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1185,6 +1185,15 @@ struct ftrace_page {
 static struct ftrace_page      *ftrace_pages_start;
 static struct ftrace_page      *ftrace_pages;
 
+static __always_inline unsigned long
+ftrace_hash_key(struct ftrace_hash *hash, unsigned long ip)
+{
+       if (hash->size_bits > 0)
+               return hash_long(ip, hash->size_bits);
+
+       return 0;
+}
+
 struct ftrace_func_entry *
 ftrace_lookup_ip(struct ftrace_hash *hash, unsigned long ip)
 {
@@ -1195,11 +1204,7 @@ ftrace_lookup_ip(struct ftrace_hash *hash, unsigned long ip)
        if (ftrace_hash_empty(hash))
                return NULL;
 
-       if (hash->size_bits > 0)
-               key = hash_long(ip, hash->size_bits);
-       else
-               key = 0;
-
+       key = ftrace_hash_key(hash, ip);
        hhd = &hash->buckets[key];
 
        hlist_for_each_entry_rcu_notrace(entry, hhd, hlist) {
@@ -1215,11 +1220,7 @@ static void __add_hash_entry(struct ftrace_hash *hash,
        struct hlist_head *hhd;
        unsigned long key;
 
-       if (hash->size_bits)
-               key = hash_long(entry->ip, hash->size_bits);
-       else
-               key = 0;
-
+       key = ftrace_hash_key(hash, entry->ip);
        hhd = &hash->buckets[key];
        hlist_add_head(&entry->hlist, hhd);
        hash->count++;