evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hwrng: Avoid manual device_create_file() calls

Browse source 
Use the new group field of struct miscdevice for managing the sysfs
entries instead of manually adding/removing via device_create_file()
and device_remove_file().  This simplifies the code a lot and fixes
the possible races.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai 2015-02-02 15:44:55 +01:00 • committed by Greg Kroah-Hartman
parent bd73599530
commit 0daa7a0afd
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/char/hw_random/core.c
View file

@ -299,11 +299,14 @@ static const struct file_operations rng_chrdev_ops = {
.llseek = noop_llseek, .llseek = noop_llseek,
}; };
static const struct attribute_group *rng_dev_groups[];
static struct miscdevice rng_miscdev = { static struct miscdevice rng_miscdev = {
.minor = RNG_MISCDEV_MINOR, .minor = RNG_MISCDEV_MINOR,
.name = RNG_MODULE_NAME, .name = RNG_MODULE_NAME,
.nodename = "hwrng", .nodename = "hwrng",
.fops = &rng_chrdev_ops, .fops = &rng_chrdev_ops,
.groups = rng_dev_groups,
}; };
@ -376,37 +379,22 @@ static DEVICE_ATTR(rng_available, S_IRUGO,
hwrng_attr_available_show, hwrng_attr_available_show,
NULL); NULL);
static struct attribute *rng_dev_attrs[] = {
&dev_attr_rng_current.attr,
&dev_attr_rng_available.attr,
NULL
};
ATTRIBUTE_GROUPS(rng_dev);
static void __exit unregister_miscdev(void) static void __exit unregister_miscdev(void)
{ {
device_remove_file(rng_miscdev.this_device, &dev_attr_rng_available);
device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
misc_deregister(&rng_miscdev); misc_deregister(&rng_miscdev);
} }
static int __init register_miscdev(void) static int __init register_miscdev(void)
{ {
int err; return misc_register(&rng_miscdev);
err = misc_register(&rng_miscdev);
if (err)
goto out;
err = device_create_file(rng_miscdev.this_device,
&dev_attr_rng_current);
if (err)
goto err_misc_dereg;
err = device_create_file(rng_miscdev.this_device,
&dev_attr_rng_available);
if (err)
goto err_remove_current;
out:
return err;
err_remove_current:
device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
err_misc_dereg:
misc_deregister(&rng_miscdev);
goto out;
} }
static int hwrng_fillfn(void *unused) static int hwrng_fillfn(void *unused)