]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hwrng: core - use min3() instead of nested min_t()
authorDavid Laight <david.laight.linux@gmail.com>
Wed, 19 Nov 2025 22:41:10 +0000 (22:41 +0000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 24 Nov 2025 09:44:14 +0000 (17:44 +0800)
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>
drivers/char/hw_random/core.c

index 56d888bebe0c0889e1396ffdcb5b0749e2790673..96d7fe41b373d5753c3c5dd390eefd35be585cb1 100644 (file)
@@ -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)) {