joel16/android_kernel_sony_msm8994_rework
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994_rework.git synced 2024-12-23 20:37:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-11-02 16:19:59 -07:00
parent 9651d350ab
commit 99e0d2fc6c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/bus.c
View File

@ -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)
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();

2
drivers/acpi/system.c
View File

@ -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)

2
include/acpi/acpi_bus.h
View File

@ -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