From foo@baz Tue Apr 9 12:12:43 2002 Date: Fri, 2 Nov 2007 16:19:59 -0700 To: Greg KH From: Greg Kroah-Hartman Subject: kset: convert acpi to use kset_create Dynamically create the kset instead of declaring it statically. Cc: Kay Sievers Cc: Len Brown Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/bus.c | 11 ++++++----- drivers/acpi/system.c | 2 +- include/acpi/acpi_bus.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -744,7 +744,7 @@ static int __init acpi_bus_init(void) return -ENODEV; } -decl_subsys(acpi, NULL); +struct kset *acpi_kset; static int __init acpi_init(void) { @@ -756,10 +756,11 @@ static int __init acpi_init(void) return -ENODEV; } - result = firmware_register(&acpi_subsys); - if (result < 0) - printk(KERN_WARNING "%s: firmware_register error: %d\n", - __FUNCTION__, result); + acpi_kset = kset_create_and_add("acpi", NULL, &firmware_kset->kobj); + if (!acpi_kset) { + printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__); + acpi_kset = NULL; + } result = acpi_bus_init(); --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c @@ -135,7 +135,7 @@ static int acpi_system_sysfs_init(void) int table_index = 0; int result; - tables_kobj.parent = &acpi_subsys.kobj; + tables_kobj.parent = &acpi_kset->kobj; kobject_set_name(&tables_kobj, "tables"); result = kobject_register(&tables_kobj); if (result) --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -318,7 +318,7 @@ struct acpi_bus_event { u32 data; }; -extern struct kset acpi_subsys; +extern struct kset *acpi_kset; extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); /* * External Functions