Skip to content

Commit

Permalink
ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_n…
Browse files Browse the repository at this point in the history
…ame()

Set the kobject name via kobject_add() instead of using kobject_set_name(),
which is deprecated per Documentation/kobject.txt.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Bjorn Helgaas authored and Rafael J. Wysocki committed Sep 30, 2013
1 parent 6dedcca commit 9b5b067
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/acpi/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,12 +763,9 @@ void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
goto err_out;

kobject_init(&hotplug->kobj, &acpi_hotplug_profile_ktype);
error = kobject_set_name(&hotplug->kobj, "%s", name);
if (error)
goto err_out;

hotplug->kobj.parent = hotplug_kobj;
error = kobject_add(&hotplug->kobj, hotplug_kobj, NULL);
error = kobject_add(&hotplug->kobj, hotplug_kobj, "%s", name);
if (error)
goto err_out;

Expand Down

0 comments on commit 9b5b067

Please sign in to comment.