Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-26 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: Drop unnecessary label from acpi_bind_one()

Browse Source 
The out_free label in acpi_bind_one() is only jumped to from one
place, so in fact it is not necessary, because the code below it
can be moved to that place directly.  Move that code and drop the
label.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
This commit is contained in:
Rafael J. Wysocki 2013-08-08 16:19:10 +02:00
parent 38e88839ef
commit 3342c753bd
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/acpi/glue.c
View File

@ -225,11 +225,15 @@ int acpi_bind_one(struct device *dev, acpi_handle handle)
list_for_each_entry(pn, &acpi_dev->physical_node_list, node) {
/* Sanity check. */
if (pn->dev == dev) {
dev_warn(dev, "Already associated with ACPI node\n");
if (ACPI_HANDLE(dev) == handle)
retval = 0;
mutex_unlock(&acpi_dev->physical_node_lock);
goto out_free;
dev_warn(dev, "Already associated with ACPI node\n");
kfree(physical_node);
if (ACPI_HANDLE(dev) != handle)
goto err;
put_device(dev);
return 0;
}
if (pn->node_id == node_id) {
physnode_list = &pn->node;
@ -262,15 +266,6 @@ int acpi_bind_one(struct device *dev, acpi_handle handle)
ACPI_HANDLE_SET(dev, NULL);
put_device(dev);
return retval;
out_free:
mutex_unlock(&acpi_dev->physical_node_lock);
kfree(physical_node);
if (retval)
goto err;
put_device(dev);
return 0;
}
EXPORT_SYMBOL_GPL(acpi_bind_one);