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.shevche...@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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to