From: Matthew Wilcox <willy@infradead.org>
Date: Wed, 19 Dec 2018 14:13:51 +0000 (-0500)
Subject: printf: Convert netdev_bits to printf_state
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=66c95efcd6541a64f0e597ac7218da581cc122f7;p=users%2Fwilly%2Flinux.git

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 9dad5d74e9f1..50310d9df6d0 100644
--- 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':