From: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
To: herbert@gondor.apana.org.au, freude@linux.vnet.ibm.com,
david.daney@cavium.com, clabbe.montjoie@gmail.com,
linux-crypto@vger.kernel.org, mpm@selenic.com
Cc: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
Subject: [PATCH 4/4] hw_random: core: Remove forward declaration of hwrng_init
Date: Thu, 26 Oct 2017 21:04:27 +0530 [thread overview]
Message-ID: <20171026153427.22334-5-prasannatsmkumar@gmail.com> (raw)
In-Reply-To: <20171026153427.22334-1-prasannatsmkumar@gmail.com>
Rearrange set_current_rng such that hwrng_init's forward declaration can
be removed.
Signed-off-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
---
drivers/char/hw_random/core.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 534c2ae..328d065 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -49,8 +49,6 @@ module_param(default_quality, ushort, 0644);
MODULE_PARM_DESC(default_quality,
"default entropy content of hwrng per mill");
-static int hwrng_init(struct hwrng *rng);
-
static size_t rng_buffer_size(void)
{
return SMP_CACHE_BYTES < 32 ? 32 : SMP_CACHE_BYTES;
@@ -108,22 +106,6 @@ static void drop_current_rng(void)
current_rng = NULL;
}
-static int set_current_rng(struct hwrng *rng)
-{
- int err;
-
- BUG_ON(!mutex_is_locked(&rng_mutex));
-
- err = hwrng_init(rng);
- if (err)
- return err;
-
- drop_current_rng();
- current_rng = rng;
-
- return 0;
-}
-
/* Returns ERR_PTR(), NULL or refcounted hwrng */
static struct hwrng *get_current_rng(void)
{
@@ -220,6 +202,22 @@ static int hwrng_init(struct hwrng *rng)
return 0;
}
+static int set_current_rng(struct hwrng *rng)
+{
+ int err;
+
+ BUG_ON(!mutex_is_locked(&rng_mutex));
+
+ err = hwrng_init(rng);
+ if (err)
+ return err;
+
+ drop_current_rng();
+ current_rng = rng;
+
+ return 0;
+}
+
static int rng_dev_open(struct inode *inode, struct file *filp)
{
/* enforce read-only access to this chrdev */
--
2.10.0
next prev parent reply other threads:[~2017-10-26 15:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 15:34 [PATCH 0/4] Rearrange functions to remove forward declarations PrasannaKumar Muralidharan
2017-10-26 15:34 ` [PATCH 1/4] hw_random: core: Remove forward declaration by rearranging code PrasannaKumar Muralidharan
2017-10-26 15:34 ` [PATCH 2/4] hw_random: core: Rearranging rng_get_data to remove forward declaration PrasannaKumar Muralidharan
2017-10-26 15:34 ` [PATCH 3/4] hw_random: core: Rearranging start_khwrngd " PrasannaKumar Muralidharan
2017-10-26 15:34 ` PrasannaKumar Muralidharan [this message]
2017-10-26 16:48 ` [PATCH 0/4] Rearrange functions to remove forward declarations David Daney
2017-10-26 17:03 ` PrasannaKumar Muralidharan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171026153427.22334-5-prasannatsmkumar@gmail.com \
--to=prasannatsmkumar@gmail.com \
--cc=clabbe.montjoie@gmail.com \
--cc=david.daney@cavium.com \
--cc=freude@linux.vnet.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=mpm@selenic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).