From: Thorsten Blum <thorsten.blum@linux.dev>
Date: Mon, 18 May 2026 12:31:47 +0000 (+0200)
Subject: lib/vsprintf: replace min_t/max_t with min/max
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26ea7f319a1fe48cfcf0714a5f459443742aca31;p=thirdparty%2Fkernel%2Fstable.git

lib/vsprintf: replace min_t/max_t with min/max

Use the simpler min()/max() macros since the values are all compatible.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://patch.msgid.link/20260518123145.79411-3-thorsten.blum@linux.dev
Signed-off-by: Petr Mladek <pmladek@suse.com>
---

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 90b267b59254..6c0aff78b3bc 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1209,7 +1209,7 @@ char *hex_string(char *buf, char *end, u8 *addr, struct printf_spec spec,
 	}
 
 	if (spec.field_width > 0)
-		len = min_t(int, spec.field_width, 64);
+		len = min(spec.field_width, 64);
 
 	for (i = 0; i < len; ++i) {
 		if (buf < end)
@@ -1234,7 +1234,7 @@ char *bitmap_string(char *buf, char *end, const unsigned long *bitmap,
 		    struct printf_spec spec, const char *fmt)
 {
 	const int CHUNKSZ = 32;
-	int nr_bits = max_t(int, spec.field_width, 0);
+	int nr_bits = max(spec.field_width, 0);
 	int i, chunksz;
 	bool first = true;
 
@@ -1277,7 +1277,7 @@ static noinline_for_stack
 char *bitmap_list_string(char *buf, char *end, const unsigned long *bitmap,
 			 struct printf_spec spec, const char *fmt)
 {
-	int nr_bits = max_t(int, spec.field_width, 0);
+	int nr_bits = max(spec.field_width, 0);
 	bool first = true;
 	int rbot, rtop;