ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

kset: convert kernel_subsys to use kset_create

Browse Source 
Dynamically create the kset instead of declaring it statically.  We also
rename kernel_subsys to kernel_kset to catch all users of this symbol
with a build error instead of an easy-to-ignore build warning.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2007-10-29 20:13:17 +01:00
parent e5e38a86c0
commit bd35b93d80
8 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/ksysfs.c
View File

@@ -94,8 +94,8 @@ static struct bin_attribute notes_attr = {
.read = &notes_read,
};
decl_subsys(kernel, NULL);
EXPORT_SYMBOL_GPL(kernel_subsys);
struct kset *kernel_kset;
EXPORT_SYMBOL_GPL(kernel_kset);
static struct attribute * kernel_attrs[] = {
#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
@@ -116,24 +116,42 @@ static struct attribute_group kernel_attr_group = {
static int __init ksysfs_init(void)
{
int error = subsystem_register(&kernel_subsys);
if (!error)
error = sysfs_create_group(&kernel_subsys.kobj,
&kernel_attr_group);
int error;
if (!error && notes_size > 0) {
kernel_kset = kset_create_and_add("kernel", NULL, NULL);
if (!kernel_kset) {
error = -ENOMEM;
goto exit;
}
error = sysfs_create_group(&kernel_kset->kobj, &kernel_attr_group);
if (error)
goto kset_exit;
if (notes_size > 0) {
notes_attr.size = notes_size;
error = sysfs_create_bin_file(&kernel_subsys.kobj,
&notes_attr);
error = sysfs_create_bin_file(&kernel_kset->kobj, &notes_attr);
if (error)
goto group_exit;
}
/*
* Create "/sys/kernel/uids" directory and corresponding root user's
* directory under it.
*/
if (!error)
error = uids_kobject_init();
error = uids_kobject_init();
if (error)
goto notes_exit;
return 0;
notes_exit:
if (notes_size > 0)
sysfs_remove_bin_file(&kernel_kset->kobj, &notes_attr);
group_exit:
sysfs_remove_group(&kernel_kset->kobj, &kernel_attr_group);
kset_exit:
kset_unregister(kernel_kset);
exit:
return error;
}