Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HWRNG: add possibility to remove hwrng devices during suspend/resume

Browse Source 
Make it possible to unregister a Hardware Random Number Generator
device object in a safe way during a suspend/resume cycle.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Michael Buesch <mb@bu3sch.de>
Cc: Michael Buesch <mb@bu3sch.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rafael J. Wysocki 2008-02-04 22:30:13 -08:00 committed by Linus Torvalds
parent 533354d4ac
commit a41e3dc406
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,11 +234,11 @@ static DEVICE_ATTR(rng_available, S_IRUGO,
NULL); NULL);
static void unregister_miscdev(void) static void unregister_miscdev(bool suspended)
{ {
device_remove_file(rng_miscdev.this_device, &dev_attr_rng_available); device_remove_file(rng_miscdev.this_device, &dev_attr_rng_available);
device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current); device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
misc_deregister(&rng_miscdev); __misc_deregister(&rng_miscdev, suspended);
} }
static int register_miscdev(void) static int register_miscdev(void)
@ -313,7 +313,7 @@ out:
} }
EXPORT_SYMBOL_GPL(hwrng_register); EXPORT_SYMBOL_GPL(hwrng_register);
void hwrng_unregister(struct hwrng *rng) void __hwrng_unregister(struct hwrng *rng, bool suspended)
{ {
int err; int err;
@ -332,11 +332,11 @@ void hwrng_unregister(struct hwrng *rng)
} }
} }
if (list_empty(&rng_list)) if (list_empty(&rng_list))
unregister_miscdev(); unregister_miscdev(suspended);
mutex_unlock(&rng_mutex); mutex_unlock(&rng_mutex);
} }
EXPORT_SYMBOL_GPL(hwrng_unregister); EXPORT_SYMBOL_GPL(__hwrng_unregister);
MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver"); MODULE_DESCRIPTION("H/W Random Number Generator (RNG) driver");

10
include/linux/hw_random.h
View File

@ -44,7 +44,15 @@ struct hwrng {
/** Register a new Hardware Random Number Generator driver. */ /** Register a new Hardware Random Number Generator driver. */
extern int hwrng_register(struct hwrng *rng); extern int hwrng_register(struct hwrng *rng);
/** Unregister a Hardware Random Number Generator driver. */ /** Unregister a Hardware Random Number Generator driver. */
extern void hwrng_unregister(struct hwrng *rng); extern void __hwrng_unregister(struct hwrng *rng, bool suspended);
static inline void hwrng_unregister(struct hwrng *rng)
{
__hwrng_unregister(rng, false);
}
static inline void hwrng_unregister_suspended(struct hwrng *rng)
{
__hwrng_unregister(rng, true);
}
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* LINUX_HWRANDOM_H_ */ #endif /* LINUX_HWRANDOM_H_ */