openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwrng: core - Drop current rng in set_current_rng 

Rather than having callers of set_current_rng call drop_current_rng,
we can do it directly in set_current_rng.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2014-12-23 16:40:21 +11:00
parent ac3a497f13
commit ff77c150f7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/hw_random/core.c
View File

@ -70,6 +70,7 @@ module_param(default_quality, ushort, 0644);
MODULE_PARM_DESC(default_quality, MODULE_PARM_DESC(default_quality,
"default entropy content of hwrng per mill"); "default entropy content of hwrng per mill");
static void drop_current_rng(void);
static void start_khwrngd(void); static void start_khwrngd(void);
static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size, static inline int rng_get_data(struct hwrng *rng, u8 *buffer, size_t size,
@ -105,6 +106,7 @@ static inline void cleanup_rng(struct kref *kref)
static void set_current_rng(struct hwrng *rng) static void set_current_rng(struct hwrng *rng)
{ {
BUG_ON(!mutex_is_locked(&rng_mutex)); BUG_ON(!mutex_is_locked(&rng_mutex));
drop_current_rng();
current_rng = rng; current_rng = rng;
} }
@ -315,7 +317,6 @@ static ssize_t hwrng_attr_current_store(struct device *dev,
err = hwrng_init(rng); err = hwrng_init(rng);
if (err) if (err)
break; break;
drop_current_rng();
set_current_rng(rng); set_current_rng(rng);
err = 0; err = 0;
break; break;