Kobject: change drivers/acpi/system.c to use kobject_create_and_add
Stop using kobject_register for this static kobject, as it's overkill. This way is much simpler. Cc: Len Brown <len.brown@intel.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5b3f355d8f
commit
a77aa28a2d
|
@ -58,7 +58,7 @@ module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
|
||||||
FS Interface (/sys)
|
FS Interface (/sys)
|
||||||
-------------------------------------------------------------------------- */
|
-------------------------------------------------------------------------- */
|
||||||
static LIST_HEAD(acpi_table_attr_list);
|
static LIST_HEAD(acpi_table_attr_list);
|
||||||
static struct kobject tables_kobj;
|
static struct kobject *tables_kobj;
|
||||||
|
|
||||||
struct acpi_table_attr {
|
struct acpi_table_attr {
|
||||||
struct bin_attribute attr;
|
struct bin_attribute attr;
|
||||||
|
@ -135,11 +135,9 @@ static int acpi_system_sysfs_init(void)
|
||||||
int table_index = 0;
|
int table_index = 0;
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
tables_kobj.parent = acpi_kobj;
|
tables_kobj = kobject_create_and_add("tables", acpi_kobj);
|
||||||
kobject_set_name(&tables_kobj, "tables");
|
if (!tables_kobj)
|
||||||
result = kobject_register(&tables_kobj);
|
return -ENOMEM;
|
||||||
if (result)
|
|
||||||
return result;
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
result = acpi_get_table_by_index(table_index, &table_header);
|
result = acpi_get_table_by_index(table_index, &table_header);
|
||||||
|
@ -153,7 +151,7 @@ static int acpi_system_sysfs_init(void)
|
||||||
|
|
||||||
acpi_table_attr_init(table_attr, table_header);
|
acpi_table_attr_init(table_attr, table_header);
|
||||||
result =
|
result =
|
||||||
sysfs_create_bin_file(&tables_kobj,
|
sysfs_create_bin_file(tables_kobj,
|
||||||
&table_attr->attr);
|
&table_attr->attr);
|
||||||
if (result) {
|
if (result) {
|
||||||
kfree(table_attr);
|
kfree(table_attr);
|
||||||
|
@ -163,6 +161,7 @@ static int acpi_system_sysfs_init(void)
|
||||||
&acpi_table_attr_list);
|
&acpi_table_attr_list);
|
||||||
}
|
}
|
||||||
} while (!result);
|
} while (!result);
|
||||||
|
kobject_uevent(tables_kobj, KOBJ_ADD);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue