[PATCH v2 2/2] lib/vsprintf: factor out %pN[F] handler as netdev_bits()

Path	csiph.com!feeder.erje.net!2.us.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 2/2] lib/vsprintf: factor out %pN[F] handler as netdev_bits()
Date	Tue, 29 Dec 2015 17:50:02 +0100
Message-ID	<qL5Dc-321-3@gated-at.bofh.it> (permalink)
References	<qL5Dc-321-5@gated-at.bofh.it>
X-Original-To	Andrew Morton <akpm@linux-foundation.org>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, linux-kernel@vger.kernel.org, Joe Perches <joe@perches.com>
X-Extloop1	1
X-Ironport-Av	E=Sophos;i="5.20,496,1444719600"; d="scan'208";a="882943738"
X-Mailer	git-send-email 2.6.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	63
Organization	linux.* mail to news gateway
X-Original-Cc	Andy Shevchenko <andriy.shevchenko@linux.intel.com>
X-Original-Date	Tue, 29 Dec 2015 18:42:38 +0200
X-Original-Message-ID	<1451407358-7041-3-git-send-email-andriy.shevchenko@linux.intel.com>
X-Original-References	<1451407358-7041-1-git-send-email-andriy.shevchenko@linux.intel.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1299051

Show key headers only | View raw

Move switch case to the netdev_features_string() and rename it to
netdev_bits(). In the future we can extend it as needed.

Here we replace the fallback of %pN from '%p' with possible flags to sticter
'0x%p' without any flags variation.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 lib/vsprintf.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 6946431..5c22317 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1324,11 +1324,22 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
 	return string(buf, end, uuid, spec);
 }
 
-static
-char *netdev_feature_string(char *buf, char *end, const void *addr)
+static noinline_for_stack
+char *netdev_bits(char *buf, char *end, const void *addr, const char *fmt)
 {
-	unsigned long long num = *(const netdev_features_t *)addr;
-	int size = sizeof(netdev_features_t);
+	unsigned long long num;
+	int size;
+
+	switch (fmt[1]) {
+	case 'F':
+		num = *(const netdev_features_t *)addr;
+		size = sizeof(netdev_features_t);
+		break;
+	default:
+		num = (unsigned long)addr;
+		size = sizeof(unsigned long);
+		break;
+	}
 
 	return special_hex_number(buf, end, num, size);
 }
@@ -1671,11 +1682,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 		break;
 
 	case 'N':
-		switch (fmt[1]) {
-		case 'F':
-			return netdev_feature_string(buf, end, ptr);
-		}
-		break;
+		return netdev_bits(buf, end, ptr, fmt);
 	case 'a':
 		return address_val(buf, end, ptr, fmt);
 	case 'd':
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2 2/2] lib/vsprintf: factor out %pN[F] handler as netdev_bits() Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2015-12-29 17:50 +0100

csiph-web