scripts/kallsyms: move ignored symbol types to is_ignored_symbol()

Collect the ignored patterns to is_ignored_symbol().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 04a1dd16edcfea5a35b0c0620aeb63ffdcede1e6..d90a6133d7b85dcb144f954e3318b3e0e5d87314 100644 (file)
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -137,6 +137,21 @@ static bool is_ignored_symbol(const char *name, char type)
                        return true;
        }
 
+       if (type == 'U' || type == 'u')
+               return true;
+       /* exclude debugging symbols */
+       if (type == 'N' || type == 'n')
+               return true;
+
+       if (toupper(type) == 'A') {
+               /* Keep these useful absolute symbols */
+               if (strcmp(name, "__kernel_syscall_via_break") &&
+                   strcmp(name, "__kernel_syscall_via_epc") &&
+                   strcmp(name, "__kernel_sigtramp") &&
+                   strcmp(name, "__gp"))
+                       return true;
+       }
+
        return false;
 }
 
@@ -188,21 +203,6 @@ static int read_symbol(FILE *in, struct sym_entry *s)
        else if (check_symbol_range(sym, s->addr, text_ranges,
                                    ARRAY_SIZE(text_ranges)) == 0)
                /* nothing to do */;
-       else if (toupper(stype) == 'A')
-       {
-               /* Keep these useful absolute symbols */
-               if (strcmp(sym, "__kernel_syscall_via_break") &&
-                   strcmp(sym, "__kernel_syscall_via_epc") &&
-                   strcmp(sym, "__kernel_sigtramp") &&
-                   strcmp(sym, "__gp"))
-                       return -1;
-
-       }
-       else if (toupper(stype) == 'U')
-               return -1;
-       /* exclude debugging symbols */
-       else if (stype == 'N' || stype == 'n')
-               return -1;
 
        /* include the type field in the symbol name, so that it gets
         * compressed together */