Commit 99e0d2fc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

kobject: convert /sys/firmware/acpi/ to use kobject_create

We don't need a kset here, a simple kobject will do just fine, so
dynamically create the kobject and use it.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9651d350
...@@ -743,7 +743,7 @@ static int __init acpi_bus_init(void) ...@@ -743,7 +743,7 @@ static int __init acpi_bus_init(void)
return -ENODEV; return -ENODEV;
} }
decl_subsys(acpi, NULL); struct kobject *acpi_kobj;
static int __init acpi_init(void) static int __init acpi_init(void)
{ {
...@@ -755,10 +755,11 @@ static int __init acpi_init(void) ...@@ -755,10 +755,11 @@ static int __init acpi_init(void)
return -ENODEV; return -ENODEV;
} }
result = firmware_register(&acpi_subsys); acpi_kobj = kobject_create_and_add("acpi", &firmware_kset->kobj);
if (result < 0) if (!acpi_kobj) {
printk(KERN_WARNING "%s: firmware_register error: %d\n", printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);
__FUNCTION__, result); acpi_kobj = NULL;
}
result = acpi_bus_init(); result = acpi_bus_init();
......
...@@ -135,7 +135,7 @@ static int acpi_system_sysfs_init(void) ...@@ -135,7 +135,7 @@ static int acpi_system_sysfs_init(void)
int table_index = 0; int table_index = 0;
int result; int result;
tables_kobj.parent = &acpi_subsys.kobj; tables_kobj.parent = acpi_kobj;
kobject_set_name(&tables_kobj, "tables"); kobject_set_name(&tables_kobj, "tables");
result = kobject_register(&tables_kobj); result = kobject_register(&tables_kobj);
if (result) if (result)
......
...@@ -319,7 +319,7 @@ struct acpi_bus_event { ...@@ -319,7 +319,7 @@ struct acpi_bus_event {
u32 data; u32 data;
}; };
extern struct kset acpi_subsys; extern struct kobject *acpi_kobj;
extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
/* /*
* External Functions * External Functions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment