diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-25 16:23:20 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-30 13:58:18 -0400 |
commit | acd3e2c99464c0391885d58dbe7c99a11d4c0289 (patch) | |
tree | 1771219c4d30e026e0e5504045d3268602e6b03b /drivers/acpi/sysfs.c | |
parent | cae712724161c27f5e8c39bb3946449e1c179881 (diff) |
ACPI / hotplug: Use kobject_init_and_add() instead of _init() and _add()
Use kobject_init_and_add() since we have nothing special to do between
kobject_init() and kobject_add().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/sysfs.c')
-rw-r--r-- | drivers/acpi/sysfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 75432819579c..bb6045c5385b 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c | |||
@@ -762,9 +762,8 @@ void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug, | |||
762 | if (!hotplug_kobj) | 762 | if (!hotplug_kobj) |
763 | goto err_out; | 763 | goto err_out; |
764 | 764 | ||
765 | kobject_init(&hotplug->kobj, &acpi_hotplug_profile_ktype); | 765 | error = kobject_init_and_add(&hotplug->kobj, |
766 | 766 | &acpi_hotplug_profile_ktype, hotplug_kobj, "%s", name); | |
767 | error = kobject_add(&hotplug->kobj, hotplug_kobj, "%s", name); | ||
768 | if (error) | 767 | if (error) |
769 | goto err_out; | 768 | goto err_out; |
770 | 769 | ||