ACPI: Clean up error code path in acpi_unbind_one()

The error code path in acpi_unbind_one() is unnecessarily complicated
(in particular, the err label is not really necessary) and the error
message printed by it is inaccurate (there's nothing called
'acpi_handle' in that function), so clean up those things.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 570628e1def34adf909801652486b954e4539f7e..dcba319ac3f12dbee1dbd5d7f614bd67cee11ca7 100644 (file)
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -284,8 +284,10 @@ int acpi_unbind_one(struct device *dev)
                return 0;
 
        status = acpi_bus_get_device(ACPI_HANDLE(dev), &acpi_dev);
-       if (ACPI_FAILURE(status))
-               goto err;
+       if (ACPI_FAILURE(status)) {
+               dev_err(dev, "Oops, ACPI handle corrupt in %s()\n", __func__);
+               return -EINVAL;
+       }
 
        mutex_lock(&acpi_dev->physical_node_lock);
 
@@ -307,12 +309,7 @@ int acpi_unbind_one(struct device *dev)
                }
 
        mutex_unlock(&acpi_dev->physical_node_lock);
-
        return 0;
-
-err:
-       dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
-       return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(acpi_unbind_one);