random: convert to ENTROPY_BITS for better code readability

commit 12faac30d157970fdbfa171bbeb1fb88350303b1 upstream.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-2-tiny.windzz@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 347e28159a7cbf1f91e01a74037189ae4fac8d95..cee0fe3c3d980d5706403c4879d68a82cb33fce9 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -762,7 +762,7 @@ retry:
                        if (entropy_bits < 128)
                                return;
                        crng_reseed(&primary_crng, r);
-                       entropy_bits = r->entropy_count >> ENTROPY_SHIFT;
+                       entropy_bits = ENTROPY_BITS(r);
                }
        }
 }
@@ -1397,8 +1397,7 @@ retry:
                goto retry;
 
        trace_debit_entropy(r->name, 8 * ibytes);
-       if (ibytes &&
-           (r->entropy_count >> ENTROPY_SHIFT) < random_write_wakeup_bits) {
+       if (ibytes && ENTROPY_BITS(r) < random_write_wakeup_bits) {
                wake_up_interruptible(&random_write_wait);
                kill_fasync(&fasync, SIGIO, POLL_OUT);
        }