mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
kobject: convert kernel_kset to be a kobject
kernel_kset does not need to be a kset, but a much simpler kobject now that we have kobj_attributes. We also rename kernel_kset to kernel_kobj 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:
parent
5c03c7ab88
commit
0ff21e4663
9 changed files with 18 additions and 19 deletions
|
@ -101,8 +101,8 @@ static struct bin_attribute notes_attr = {
|
|||
.read = ¬es_read,
|
||||
};
|
||||
|
||||
struct kset *kernel_kset;
|
||||
EXPORT_SYMBOL_GPL(kernel_kset);
|
||||
struct kobject *kernel_kobj;
|
||||
EXPORT_SYMBOL_GPL(kernel_kobj);
|
||||
|
||||
static struct attribute * kernel_attrs[] = {
|
||||
#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
|
||||
|
@ -125,18 +125,18 @@ static int __init ksysfs_init(void)
|
|||
{
|
||||
int error;
|
||||
|
||||
kernel_kset = kset_create_and_add("kernel", NULL, NULL);
|
||||
if (!kernel_kset) {
|
||||
kernel_kobj = kobject_create_and_add("kernel", NULL);
|
||||
if (!kernel_kobj) {
|
||||
error = -ENOMEM;
|
||||
goto exit;
|
||||
}
|
||||
error = sysfs_create_group(&kernel_kset->kobj, &kernel_attr_group);
|
||||
error = sysfs_create_group(kernel_kobj, &kernel_attr_group);
|
||||
if (error)
|
||||
goto kset_exit;
|
||||
|
||||
if (notes_size > 0) {
|
||||
notes_attr.size = notes_size;
|
||||
error = sysfs_create_bin_file(&kernel_kset->kobj, ¬es_attr);
|
||||
error = sysfs_create_bin_file(kernel_kobj, ¬es_attr);
|
||||
if (error)
|
||||
goto group_exit;
|
||||
}
|
||||
|
@ -150,11 +150,11 @@ static int __init ksysfs_init(void)
|
|||
|
||||
notes_exit:
|
||||
if (notes_size > 0)
|
||||
sysfs_remove_bin_file(&kernel_kset->kobj, ¬es_attr);
|
||||
sysfs_remove_bin_file(kernel_kobj, ¬es_attr);
|
||||
group_exit:
|
||||
sysfs_remove_group(&kernel_kset->kobj, &kernel_attr_group);
|
||||
sysfs_remove_group(kernel_kobj, &kernel_attr_group);
|
||||
kset_exit:
|
||||
kset_unregister(kernel_kset);
|
||||
kobject_unregister(kernel_kobj);
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue