From: Matthew Wilcox <willy@infradead.org>
Date: Wed, 12 Dec 2018 18:46:09 +0000 (-0500)
Subject: printf: Convert pointer() to take a printf_state
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0616cde4d46d3396271fd99279846e30e1c8780c;p=users%2Fwilly%2Flinux.git

printf: Convert pointer() to take a printf_state

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

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 277b02c5141b..7d61376ae6ee 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1857,9 +1857,13 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
  * rendering it useful as a unique identifier.
  */
 static noinline_for_stack
-char *pointer(const char *fmt, char *buf, char *end, void *ptr,
-	      struct printf_spec spec)
+char *pointer(struct printf_state *ps, void *ptr)
 {
+	char *buf = ps->buf;
+	char *end = ps->end;
+	const char *fmt = ps->fmt;
+	struct printf_spec spec = ps->spec;
+
 	const int default_width = 2 * sizeof(void *);
 
 	if (!ptr && *fmt != 'K' && *fmt != 'x') {
@@ -1982,7 +1986,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
 
 void printf_pointer(struct printf_state *ps, void *ptr)
 {
-	ps->buf = pointer(ps->fmt, ps->buf, ps->end, ptr, ps->spec);
+	ps->buf = pointer(ps, ptr);
 }
 
 /*