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 3/4] hw_random: core: Rearranging start_khwrngd to remove forward declaration
Date: Thu, 26 Oct 2017 21:04:26 +0530 [thread overview]
Message-ID: <20171026153427.22334-4-prasannatsmkumar@gmail.com> (raw)
In-Reply-To: <20171026153427.22334-1-prasannatsmkumar@gmail.com>
Rearrange start_khwrngd such that its forward declaration is not
required.
Signed-off-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
---
drivers/char/hw_random/core.c | 75 +++++++++++++++++++++----------------------
1 file changed, 37 insertions(+), 38 deletions(-)
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 7e2b1a7..534c2ae 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -50,7 +50,6 @@ MODULE_PARM_DESC(default_quality,
"default entropy content of hwrng per mill");
static int hwrng_init(struct hwrng *rng);
-static void start_khwrngd(void);
static size_t rng_buffer_size(void)
{
@@ -153,6 +152,43 @@ static void put_rng(struct hwrng *rng)
mutex_unlock(&rng_mutex);
}
+static int hwrng_fillfn(void *unused)
+{
+ long rc;
+
+ while (!kthread_should_stop()) {
+ struct hwrng *rng;
+
+ rng = get_current_rng();
+ if (IS_ERR(rng) || !rng)
+ break;
+ mutex_lock(&reading_mutex);
+ rc = rng_get_data(rng, rng_fillbuf,
+ rng_buffer_size(), 1);
+ mutex_unlock(&reading_mutex);
+ put_rng(rng);
+ if (rc <= 0) {
+ pr_warn("hwrng: no data available\n");
+ msleep_interruptible(10000);
+ continue;
+ }
+ /* Outside lock, sure, but y'know: randomness. */
+ add_hwgenerator_randomness((void *)rng_fillbuf, rc,
+ rc * current_quality * 8 >> 10);
+ }
+ hwrng_fill = NULL;
+ return 0;
+}
+
+static void start_khwrngd(void)
+{
+ hwrng_fill = kthread_run(hwrng_fillfn, NULL, "hwrng");
+ if (IS_ERR(hwrng_fill)) {
+ pr_err("hwrng_fill thread creation failed");
+ hwrng_fill = NULL;
+ }
+}
+
static int hwrng_init(struct hwrng *rng)
{
if (kref_get_unless_zero(&rng->ref))
@@ -387,43 +423,6 @@ static int __init register_miscdev(void)
return misc_register(&rng_miscdev);
}
-static int hwrng_fillfn(void *unused)
-{
- long rc;
-
- while (!kthread_should_stop()) {
- struct hwrng *rng;
-
- rng = get_current_rng();
- if (IS_ERR(rng) || !rng)
- break;
- mutex_lock(&reading_mutex);
- rc = rng_get_data(rng, rng_fillbuf,
- rng_buffer_size(), 1);
- mutex_unlock(&reading_mutex);
- put_rng(rng);
- if (rc <= 0) {
- pr_warn("hwrng: no data available\n");
- msleep_interruptible(10000);
- continue;
- }
- /* Outside lock, sure, but y'know: randomness. */
- add_hwgenerator_randomness((void *)rng_fillbuf, rc,
- rc * current_quality * 8 >> 10);
- }
- hwrng_fill = NULL;
- return 0;
-}
-
-static void start_khwrngd(void)
-{
- hwrng_fill = kthread_run(hwrng_fillfn, NULL, "hwrng");
- if (IS_ERR(hwrng_fill)) {
- pr_err("hwrng_fill thread creation failed");
- hwrng_fill = NULL;
- }
-}
-
int hwrng_register(struct hwrng *rng)
{
int err = -EINVAL;
--
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 ` PrasannaKumar Muralidharan [this message]
2017-10-26 15:34 ` [PATCH 4/4] hw_random: core: Remove forward declaration of hwrng_init PrasannaKumar Muralidharan
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-4-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).