printf: Convert netdev_bits to printf_state

Signed-off-by: Matthew Wilcox <willy@infradead.org>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 9dad5d74e9f152ebf0e97cd28e912fe9f95d9201..50310d9df6d09b85d8a256ad209eb64df27b48d2 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1516,22 +1516,21 @@ char *restricted_pointer(char *buf, char *end, const void *ptr,
 }
 
 static noinline_for_stack
-char *netdev_bits(char *buf, char *end, const void *addr,
-                 struct printf_spec spec,  const char *fmt)
+char *netdev_bits(struct printf_state *ps, const void *addr)
 {
        unsigned long long num;
        int size;
 
-       switch (fmt[1]) {
+       switch (ps->fmt[1]) {
        case 'F':
                num = *(const netdev_features_t *)addr;
                size = sizeof(netdev_features_t);
                break;
        default:
-               return ptr_to_id(buf, end, addr, spec);
+               return ptr_to_id(ps->buf, ps->end, addr, ps->spec);
        }
 
-       return special_hex_number(buf, end, num, size);
+       return special_hex_number(ps->buf, ps->end, num, size);
 }
 
 static noinline_for_stack
@@ -1957,7 +1956,7 @@ char *pointer(struct printf_state *ps, void *ptr)
                        break;
                return restricted_pointer(buf, end, ptr, spec);
        case 'N':
-               return netdev_bits(buf, end, ptr, spec, fmt);
+               return netdev_bits(ps, ptr);
        case 'a':
                return address_val(buf, end, ptr, fmt);
        case 'D':