From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756127AbcANW1c (ORCPT ); Thu, 14 Jan 2016 17:27:32 -0500 Received: from mga02.intel.com ([134.134.136.20]:19095 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754529AbcANWXx (ORCPT ); Thu, 14 Jan 2016 17:23:53 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,296,1449561600"; d="scan'208";a="633595749" From: Andy Shevchenko To: Robert Elliott , Matt Fleming , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-kernel@vger.kernel.org, Rasmus Villemoes , Brian Norris , Hariprasad S Cc: Andy Shevchenko Subject: [PATCH v2 03/11] lib/vsprintf: make default_str_spec global Date: Fri, 15 Jan 2016 00:23:33 +0200 Message-Id: <1452810221-116505-4-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452810221-116505-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1452810221-116505-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There will be place where default specification to print string is used. Make it global and convert existing user. Signed-off-by: Andy Shevchenko --- lib/vsprintf.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 53a6e7c..f0789e3 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -671,6 +671,12 @@ static const struct printf_spec default_dec_spec = { .precision = -1, }; +static const struct printf_spec default_str_spec = { + .field_width = -1, + .precision = 10, + .flags = LEFT, +}; + static noinline_for_stack char *resource_string(char *buf, char *end, struct resource *res, struct printf_spec spec, const char *fmt) @@ -700,11 +706,6 @@ char *resource_string(char *buf, char *end, struct resource *res, .precision = -1, .flags = SMALL | ZEROPAD, }; - static const struct printf_spec str_spec = { - .field_width = -1, - .precision = 10, - .flags = LEFT, - }; static const struct printf_spec flag_spec = { .base = 16, .precision = -1, @@ -726,27 +727,27 @@ char *resource_string(char *buf, char *end, struct resource *res, *p++ = '['; if (res->flags & IORESOURCE_IO) { - p = string(p, pend, "io ", str_spec); + p = string(p, pend, "io ", default_str_spec); specp = &io_spec; } else if (res->flags & IORESOURCE_MEM) { - p = string(p, pend, "mem ", str_spec); + p = string(p, pend, "mem ", default_str_spec); specp = &mem_spec; } else if (res->flags & IORESOURCE_IRQ) { - p = string(p, pend, "irq ", str_spec); + p = string(p, pend, "irq ", default_str_spec); specp = &default_dec_spec; } else if (res->flags & IORESOURCE_DMA) { - p = string(p, pend, "dma ", str_spec); + p = string(p, pend, "dma ", default_str_spec); specp = &default_dec_spec; } else if (res->flags & IORESOURCE_BUS) { - p = string(p, pend, "bus ", str_spec); + p = string(p, pend, "bus ", default_str_spec); specp = &bus_spec; } else { - p = string(p, pend, "??? ", str_spec); + p = string(p, pend, "??? ", default_str_spec); specp = &mem_spec; decode = 0; } if (decode && res->flags & IORESOURCE_UNSET) { - p = string(p, pend, "size ", str_spec); + p = string(p, pend, "size ", default_str_spec); p = number(p, pend, resource_size(res), *specp); } else { p = number(p, pend, res->start, *specp); @@ -757,15 +758,15 @@ char *resource_string(char *buf, char *end, struct resource *res, } if (decode) { if (res->flags & IORESOURCE_MEM_64) - p = string(p, pend, " 64bit", str_spec); + p = string(p, pend, " 64bit", default_str_spec); if (res->flags & IORESOURCE_PREFETCH) - p = string(p, pend, " pref", str_spec); + p = string(p, pend, " pref", default_str_spec); if (res->flags & IORESOURCE_WINDOW) - p = string(p, pend, " window", str_spec); + p = string(p, pend, " window", default_str_spec); if (res->flags & IORESOURCE_DISABLED) - p = string(p, pend, " disabled", str_spec); + p = string(p, pend, " disabled", default_str_spec); } else { - p = string(p, pend, " flags ", str_spec); + p = string(p, pend, " flags ", default_str_spec); p = number(p, pend, res->flags, flag_spec); } *p++ = ']'; -- 2.6.4