Skip to content

Commit

Permalink
Kobject: change drivers/acpi/system.c to use kobject_create_and_add
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent 5b3f355 commit a77aa28
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/acpi/system.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module_param_call(acpica_version, NULL, param_get_acpica_version, NULL, 0444);
FS Interface (/sys)
-------------------------------------------------------------------------- */
static LIST_HEAD(acpi_table_attr_list);
static struct kobject tables_kobj;
static struct kobject *tables_kobj;

struct acpi_table_attr {
struct bin_attribute attr;
Expand Down Expand Up @@ -135,11 +135,9 @@ static int acpi_system_sysfs_init(void)
int table_index = 0;
int result;

tables_kobj.parent = acpi_kobj;
kobject_set_name(&tables_kobj, "tables");
result = kobject_register(&tables_kobj);
if (result)
return result;
tables_kobj = kobject_create_and_add("tables", acpi_kobj);
if (!tables_kobj)
return -ENOMEM;

do {
result = acpi_get_table_by_index(table_index, &table_header);
Expand All @@ -153,7 +151,7 @@ static int acpi_system_sysfs_init(void)

acpi_table_attr_init(table_attr, table_header);
result =
sysfs_create_bin_file(&tables_kobj,
sysfs_create_bin_file(tables_kobj,
&table_attr->attr);
if (result) {
kfree(table_attr);
Expand All @@ -163,6 +161,7 @@ static int acpi_system_sysfs_init(void)
&acpi_table_attr_list);
}
} while (!result);
kobject_uevent(tables_kobj, KOBJ_ADD);

return 0;
}
Expand Down

0 comments on commit a77aa28

Please sign in to comment.