[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180216192806.68914-4-andriy.shevchenko@linux.intel.com>
Date: Fri, 16 Feb 2018 21:28:03 +0200
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: "Tobin C. Harding" <me@...in.cc>, linux@...musvillemoes.dk,
Petr Mladek <pmladek@...e.com>, Joe Perches <joe@...ches.com>,
linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: [PATCH v1 4/7] lib/vsprintf: Remove useless NULL checks
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 <pmladek@...e.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
---
lib/vsprintf.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 360e751305bf..79f27ebdeb6e 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -813,10 +813,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 = ':';
@@ -1255,10 +1251,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':
@@ -1442,7 +1434,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]) {
@@ -1581,9 +1573,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
Powered by blists - more mailing lists