Messages in this thread Patch in this message |  | | From | Yangtao Li <> | Subject | [PATCH 1/5] random: remove unnecessary unlikely() | Date | Fri, 7 Jun 2019 14:25:13 -0400 |
| |
WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> --- drivers/char/random.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c index 5d5ea4ce1442..bebf622c61c4 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -759,10 +759,9 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) } 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; @@ -1465,10 +1464,9 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, 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); -- 2.17.0
|  |