summaryrefslogtreecommitdiff
path: root/drivers/char/hw_random
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-12-23 16:40:17 +1100
committerHerbert Xu <herbert@gondor.apana.org.au>2014-12-26 08:33:34 +1100
commit77584ee57434813b50fc85cde995a6271a5081b7 (patch)
tree864924c83b987f586da1ee50ab4e49eac6bcafc0 /drivers/char/hw_random
parentd69e75deff2377b46b2b357ac3781cc93cd7ffd6 (diff)
hwrng: core - Use struct completion for cleanup_done
There is no point in doing a manual completion for cleanup_done when struct completion fits in perfectly. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/char/hw_random')
-rw-r--r--drivers/char/hw_random/core.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 6ec42252e46e..3dba2cf50241 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -60,7 +60,6 @@ static DEFINE_MUTEX(rng_mutex);
static DEFINE_MUTEX(reading_mutex);
static int data_avail;
static u8 *rng_buffer, *rng_fillbuf;
-static DECLARE_WAIT_QUEUE_HEAD(rng_done);
static unsigned short current_quality;
static unsigned short default_quality; /* = 0; default to "off" */
@@ -100,10 +99,7 @@ static inline void cleanup_rng(struct kref *kref)
if (rng->cleanup)
rng->cleanup(rng);
- /* cleanup_done should be updated after cleanup finishes */
- smp_wmb();
- rng->cleanup_done = true;
- wake_up_all(&rng_done);
+ complete(&rng->cleanup_done);
}
static void set_current_rng(struct hwrng *rng)
@@ -498,7 +494,7 @@ int hwrng_register(struct hwrng *rng)
add_early_randomness(rng);
}
- rng->cleanup_done = false;
+ init_completion(&rng->cleanup_done);
out_unlock:
mutex_unlock(&rng_mutex);
@@ -532,9 +528,7 @@ void hwrng_unregister(struct hwrng *rng)
} else
mutex_unlock(&rng_mutex);
- /* Just in case rng is reading right now, wait. */
- wait_event(rng_done, rng->cleanup_done &&
- atomic_read(&rng->ref.refcount) == 0);
+ wait_for_completion(&rng->cleanup_done);
}
EXPORT_SYMBOL_GPL(hwrng_unregister);