From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750984AbeBPVHW (ORCPT ); Fri, 16 Feb 2018 16:07:22 -0500 Received: from mga05.intel.com ([192.55.52.43]:50074 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750881AbeBPVHS (ORCPT ); Fri, 16 Feb 2018 16:07:18 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,520,1511856000"; d="scan'208";a="27884879" From: Andy Shevchenko To: "Tobin C . Harding" , linux@rasmusvillemoes.dk, Petr Mladek , Joe Perches , linux-kernel@vger.kernel.org, Andrew Morton Cc: Andy Shevchenko Subject: [PATCH v2 8/9] lib/vsprintf: Remove useless NULL checks Date: Fri, 16 Feb 2018 23:07:10 +0200 Message-Id: <20180216210711.79901-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180216210711.79901-1-andriy.shevchenko@linux.intel.com> References: <20180216210711.79901-1-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The pointer can't be NULL since it's first what has been done in the pointer(). Remove useless checks. Note we leave check for !CONFIG_HAVE_CLK to make compiler to optimize code away when possible. Cc: Petr Mladek Signed-off-by: Andy Shevchenko --- lib/vsprintf.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 97be2d07297a..a49da00b79e7 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -819,10 +819,6 @@ char *hex_string(char *buf, char *end, u8 *addr, struct printf_spec spec, /* nothing to print */ return buf; - if (ZERO_OR_NULL_PTR(addr)) - /* NULL pointer */ - return string(buf, end, NULL, spec); - switch (fmt[1]) { case 'C': separator = ':'; @@ -1258,10 +1254,6 @@ char *escaped_string(char *buf, char *end, u8 *addr, struct printf_spec spec, if (spec.field_width == 0) return buf; /* nothing to print */ - if (ZERO_OR_NULL_PTR(addr)) - return string(buf, end, NULL, spec); /* NULL pointer */ - - do { switch (fmt[count++]) { case 'a': @@ -1455,7 +1447,7 @@ static noinline_for_stack char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec, const char *fmt) { - if (!IS_ENABLED(CONFIG_HAVE_CLK) || !clk) + if (!IS_ENABLED(CONFIG_HAVE_CLK)) return string(buf, end, NULL, spec); switch (fmt[1]) { @@ -1580,9 +1572,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, if (!IS_ENABLED(CONFIG_OF)) return string(buf, end, "(!OF)", spec); - if ((unsigned long)dn < PAGE_SIZE) - return string(buf, end, "(null)", spec); - /* simple case without anything any more format specifiers */ fmt++; if (fmt[0] == '\0' || strcspn(fmt,"fnpPFcC") > 0) -- 2.15.1