From: Matthew Wilcox <willy@infradead.org>
Date: Wed, 19 Dec 2018 15:21:47 +0000 (-0500)
Subject: printf: Convert address_val to printf_state
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1e88c28831700788c55759c8c2ae2d68d6103ac3;p=users%2Fwilly%2Flinux.git

printf: Convert address_val to printf_state

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

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 50310d9df6d0..f0cc1d6e9356 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1534,12 +1534,12 @@ char *netdev_bits(struct printf_state *ps, const void *addr)
 }
 
 static noinline_for_stack
-char *address_val(char *buf, char *end, const void *addr, const char *fmt)
+char *address_val(struct printf_state *ps, const void *addr)
 {
 	unsigned long long num;
 	int size;
 
-	switch (fmt[1]) {
+	switch (ps->fmt[1]) {
 	case 'd':
 		num = *(const dma_addr_t *)addr;
 		size = sizeof(dma_addr_t);
@@ -1551,7 +1551,7 @@ char *address_val(char *buf, char *end, const void *addr, const char *fmt)
 		break;
 	}
 
-	return special_hex_number(buf, end, num, size);
+	return special_hex_number(ps->buf, ps->end, num, size);
 }
 
 static noinline_for_stack
@@ -1958,7 +1958,7 @@ char *pointer(struct printf_state *ps, void *ptr)
 	case 'N':
 		return netdev_bits(ps, ptr);
 	case 'a':
-		return address_val(buf, end, ptr, fmt);
+		return address_val(ps, ptr);
 	case 'D':
 		ptr = ((const struct file *)ptr)->f_path.dentry;
 		/* fall through */