random: remove unnecessary unlikely() (870e05b1) · Commits · 戴 / test

WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely. Signed-off-by:

drivers/char/random.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);