From: David Laight <david.laight.linux@gmail.com>
Date: Wed, 19 Nov 2025 22:41:10 +0000 (+0000)
Subject: hwrng: core - use min3() instead of nested min_t()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f8ead58b6dce9520fc3f9ff7f943bb0627a7a19;p=thirdparty%2Flinux.git

hwrng: core - use min3() instead of nested min_t()

min_t(u16, a, b) is likely to discard significant bits.
Replace:
	min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024);
with:
	min3(default_quality, 1024, rng->quality ?: 1024);

Signed-off-by: David Laight <david.laight.linux@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 56d888bebe0c0..96d7fe41b373d 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -545,7 +545,7 @@ int hwrng_register(struct hwrng *rng)
 	init_completion(&rng->dying);
 
 	/* Adjust quality field to always have a proper value */
-	rng->quality = min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024);
+	rng->quality = min3(default_quality, 1024, rng->quality ?: 1024);
 
 	if (!cur_rng_set_by_user &&
 	    (!current_rng || rng->quality > current_rng->quality)) {