lib/vsprintf: Make dec_spec global

There are places where default specification to print decimal numbers
is in use.

Make it global and convert existing users.

Link: http://lkml.kernel.org/r/20180216210711.79901-2-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>

1 files changed, 9 insertions, 12 deletions

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d7a708f82559..8f29af063d8a 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -693,6 +693,11 @@ char *symbol_string(char *buf, char *end, void *ptr,
 #endif
 }
 
+static const struct printf_spec default_dec_spec = {
+        .base = 10,
+        .precision = -1,
+};
+
 static noinline_for_stack
 char *resource_string(char *buf, char *end, struct resource *res,
                       struct printf_spec spec, const char *fmt)
@@ -722,11 +727,6 @@ char *resource_string(char *buf, char *end, struct resource *res,
                 .precision = -1,
                 .flags = SMALL | ZEROPAD,
         };
-        static const struct printf_spec dec_spec = {
-                .base = 10,
-                .precision = -1,
-                .flags = 0,
-        };
         static const struct printf_spec str_spec = {
                 .field_width = -1,
                 .precision = 10,
@@ -760,10 +760,10 @@ char *resource_string(char *buf, char *end, struct resource *res,
                 specp = &mem_spec;
         } else if (res->flags & IORESOURCE_IRQ) {
                 p = string(p, pend, "irq ", str_spec);
-                specp = &dec_spec;
+                specp = &default_dec_spec;
         } else if (res->flags & IORESOURCE_DMA) {
                 p = string(p, pend, "dma ", str_spec);
-                specp = &dec_spec;
+                specp = &default_dec_spec;
         } else if (res->flags & IORESOURCE_BUS) {
                 p = string(p, pend, "bus ", str_spec);
                 specp = &bus_spec;
@@ -903,9 +903,6 @@ char *bitmap_list_string(char *buf, char *end, unsigned long *bitmap,
         int cur, rbot, rtop;
         bool first = true;
 
-        /* reused to print numbers */
-        spec = (struct printf_spec){ .base = 10 };
-
         rbot = cur = find_first_bit(bitmap, nr_bits);
         while (cur < nr_bits) {
                 rtop = cur;
@@ -920,13 +917,13 @@ char *bitmap_list_string(char *buf, char *end, unsigned long *bitmap,
                 }
                 first = false;
 
-                buf = number(buf, end, rbot, spec);
+                buf = number(buf, end, rbot, default_dec_spec);
                 if (rbot < rtop) {
                         if (buf < end)
                                 *buf = '-';
                         buf++;
 
-                        buf = number(buf, end, rtop, spec);
+                        buf = number(buf, end, rtop, default_dec_spec);
                 }
 
                 rbot = cur;