diff options
| author | Yangtao Li <tiny.windzz@gmail.com> | 2020-01-07 22:10:28 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-01-07 22:10:28 +0100 |
| commit | 870e05b1b18814911cb2703a977f447cb974f0f9 (patch) | |
| tree | 63eb856d3933f2fe3a6342df2f77ecc569cbe01e | |
| parent | random: remove kernel.random.read_wakeup_threshold (diff) | |
| download | linux-870e05b1b18814911cb2703a977f447cb974f0f9.tar.xz linux-870e05b1b18814911cb2703a977f447cb974f0f9.zip | |
random: remove unnecessary unlikely()
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-1-tiny.windzz@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | drivers/char/random.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index b68da8eefcdb..e3309ce12f1d 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -736,10 +736,9 @@ retry: } while (unlikely(entropy_count < pool_size-2 && pnfrac)); } - if (unlikely(entropy_count < 0)) { + if (WARN_ON(entropy_count < 0)) { pr_warn("random: negative entropy/overflow: pool %s count %d\n", r->name, entropy_count); - WARN_ON(1); entropy_count = 0; } else if (entropy_count > pool_size) entropy_count = pool_size; @@ -1364,10 +1363,9 @@ retry: if (ibytes < min) ibytes = 0; - if (unlikely(entropy_count < 0)) { + if (WARN_ON(entropy_count < 0)) { pr_warn("random: negative entropy count: pool %s count %d\n", r->name, entropy_count); - WARN_ON(1); entropy_count = 0; } nfrac = ibytes << (ENTROPY_SHIFT + 3); |