tracing: Merge seq_print_sym_short() and seq_print_sym_offset()

These two functions are nearly identical, so we can avoid some code
duplication by moving the conditional into a common implementation.

Link: http://lkml.kernel.org/r/20181029223542.26175-2-linux@rasmusvillemoes.dk
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 6e6cc64faa389b72012f58912a32114ad45cf704..85ecd061c7be52fabdb2997937c1523a391b3450 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -339,34 +339,17 @@ static inline const char *kretprobed(const char *name)
 #endif /* CONFIG_KRETPROBES */
 
 static void
-seq_print_sym_short(struct trace_seq *s, const char *fmt, unsigned long address)
+seq_print_sym(struct trace_seq *s, const char *fmt, unsigned long address,
+             bool offset)
 {
        char str[KSYM_SYMBOL_LEN];
 #ifdef CONFIG_KALLSYMS
        const char *name;
 
-       kallsyms_lookup(address, NULL, NULL, NULL, str);
-
-       name = kretprobed(str);
-
-       if (name && strlen(name)) {
-               trace_seq_printf(s, fmt, name);
-               return;
-       }
-#endif
-       snprintf(str, KSYM_SYMBOL_LEN, "0x%08lx", address);
-       trace_seq_printf(s, fmt, str);
-}
-
-static void
-seq_print_sym_offset(struct trace_seq *s, const char *fmt,
-                    unsigned long address)
-{
-       char str[KSYM_SYMBOL_LEN];
-#ifdef CONFIG_KALLSYMS
-       const char *name;
-
-       sprint_symbol(str, address);
+       if (offset)
+               sprint_symbol(str, address);
+       else
+               kallsyms_lookup(address, NULL, NULL, NULL, str);
        name = kretprobed(str);
 
        if (name && strlen(name)) {
@@ -424,10 +407,7 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
                goto out;
        }
 
-       if (sym_flags & TRACE_ITER_SYM_OFFSET)
-               seq_print_sym_offset(s, "%s", ip);
-       else
-               seq_print_sym_short(s, "%s", ip);
+       seq_print_sym(s, "%s", ip, sym_flags & TRACE_ITER_SYM_OFFSET);
 
        if (sym_flags & TRACE_ITER_SYM_ADDR)
                trace_seq_printf(s, " <" IP_FMT ">", ip);