lib/vsprintf: Make flag_spec global

There are places where default specification to print flags as number
is in use.

Make it global and convert existing users.

Link: http://lkml.kernel.org/r/20180216210711.79901-4-andriy.shevchenko@linux.intel.com
To: "Tobin C . Harding" <me@tobin.cc>
To: linux@rasmusvillemoes.dk
To: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
To: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0c23b006b4958714c3dd4045210296c81c23242e..c789d265311b0078702d6d09dbfa90ed2a4c049a 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -698,6 +698,12 @@ static const struct printf_spec default_str_spec = {
        .precision = -1,
 };
 
+static const struct printf_spec default_flag_spec = {
+       .base = 16,
+       .precision = -1,
+       .flags = SPECIAL | SMALL,
+};
+
 static const struct printf_spec default_dec_spec = {
        .base = 10,
        .precision = -1,
@@ -737,11 +743,6 @@ char *resource_string(char *buf, char *end, struct resource *res,
                .precision = 10,
                .flags = LEFT,
        };
-       static const struct printf_spec flag_spec = {
-               .base = 16,
-               .precision = -1,
-               .flags = SPECIAL | SMALL,
-       };
 
        /* 32-bit res (sizeof==4): 10 chars in dec, 10 in hex ("0x" + 8)
         * 64-bit res (sizeof==8): 20 chars in dec, 18 in hex ("0x" + 16) */
@@ -798,7 +799,7 @@ char *resource_string(char *buf, char *end, struct resource *res,
                        p = string(p, pend, " disabled", str_spec);
        } else {
                p = string(p, pend, " flags ", str_spec);
-               p = number(p, pend, res->flags, flag_spec);
+               p = number(p, pend, res->flags, default_flag_spec);
        }
        *p++ = ']';
        *p = '\0';
@@ -1466,12 +1467,6 @@ char *format_flags(char *buf, char *end, unsigned long flags,
                                        const struct trace_print_flags *names)
 {
        unsigned long mask;
-       const struct printf_spec numspec = {
-               .flags = SPECIAL|SMALL,
-               .field_width = -1,
-               .precision = -1,
-               .base = 16,
-       };
 
        for ( ; flags && names->name; names++) {
                mask = names->mask;
@@ -1489,7 +1484,7 @@ char *format_flags(char *buf, char *end, unsigned long flags,
        }
 
        if (flags)
-               buf = number(buf, end, flags, numspec);
+               buf = number(buf, end, flags, default_flag_spec);
 
        return buf;
 }