From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 25 Sep 2013 20:23:04 +0000 (-0600)
Subject: ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_name()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9b5b06740194c8fa1cddb3aa5fe69fd6f5199bc4;p=openwrt%2Fstaging%2Fblogic.git

ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_name()

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

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 05306a59aedc..ea685835b834 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -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;