From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753498AbbJPFaq (ORCPT ); Fri, 16 Oct 2015 01:30:46 -0400 Received: from ns.horizon.com ([71.41.210.147]:30993 "HELO ns.horizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752088AbbJPFao (ORCPT ); Fri, 16 Oct 2015 01:30:44 -0400 Date: 16 Oct 2015 01:30:42 -0400 Message-ID: <20151016053042.12819.qmail@ns.horizon.com> From: "George Spelvin" To: andi@firstfloor.org, tytso@mit.edu Subject: [RFC PATCH 2/4] random: Remove two unused arguments from extract_entropy() Cc: ahferroin7@gmail.com, jepler@unpythonic.net, linux-kernel@vger.kernel.org, linux@horizon.com, linux@rasmusvillemoes.dk In-Reply-To: <20151016052802.12363.qmail@ns.horizon.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that _xfer_secondary_pool doesn't need the magic functionality, the "min" and "reserved" arguments are always zero, so stop passing them. Signed-off-by: George Spelvin --- drivers/char/random.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index c8ad49ba..e62b30ba 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1175,7 +1175,7 @@ static void extract_buf(struct entropy_store *r, __u8 out[EXTRACT_SIZE]) * pool after each pull to avoid starving other readers. */ static ssize_t extract_entropy(struct entropy_store *r, void *buf, - size_t nbytes, int min, int reserved) + size_t nbytes) { ssize_t ret = 0, i; __u8 tmp[EXTRACT_SIZE]; @@ -1199,7 +1199,7 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf, trace_extract_entropy(r->name, nbytes, ENTROPY_BITS(r), _RET_IP_); xfer_secondary_pool(r, nbytes); - nbytes = account(r, nbytes, min, reserved); + nbytes = account(r, nbytes, 0, 0); while (nbytes) { extract_buf(r, tmp); @@ -1284,7 +1284,7 @@ void get_random_bytes(void *buf, int nbytes) nonblocking_pool.entropy_total); #endif trace_get_random_bytes(nbytes, _RET_IP_); - extract_entropy(&nonblocking_pool, buf, nbytes, 0, 0); + extract_entropy(&nonblocking_pool, buf, nbytes); } EXPORT_SYMBOL(get_random_bytes); @@ -1374,7 +1374,7 @@ void get_random_bytes_arch(void *buf, int nbytes) } if (nbytes) - extract_entropy(&nonblocking_pool, p, nbytes, 0, 0); + extract_entropy(&nonblocking_pool, p, nbytes); } EXPORT_SYMBOL(get_random_bytes_arch); -- 2.6.1 h