[PATCH 8/24][Resend] ACPI / hotplug / PCI: Simplify register_slot()
From: Rafael J. Wysocki
The err label in register_slot() is only jumped to from one place,
so move the code under the label to that place and drop the label.
Signed-off-by: Rafael J. Wysocki
Tested-by: Mika Westerberg
---
drivers/pci/hotplug/acpiphp_glue.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
Index: linux-pm/drivers/pci/hotplug/acpiphp_glue.c
===
--- linux-pm.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-pm/drivers/pci/hotplug/acpiphp_glue.c
@@ -335,8 +335,10 @@ static acpi_status register_slot(acpi_ha
slot = kzalloc(sizeof(struct acpiphp_slot), GFP_KERNEL);
if (!slot) {
- status = AE_NO_MEMORY;
- goto err;
+ mutex_lock(_context_lock);
+ acpiphp_put_context(context);
+ mutex_unlock(_context_lock);
+ return AE_NO_MEMORY;
}
slot->bus = bridge->pci_bus;
@@ -404,12 +406,6 @@ static acpi_status register_slot(acpi_ha
}
return AE_OK;
-
- err:
- mutex_lock(_context_lock);
- acpiphp_put_context(context);
- mutex_unlock(_context_lock);
- return status;
}
static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 8/24][Resend] ACPI / hotplug / PCI: Simplify register_slot()
From: Rafael J. Wysocki rafael.j.wyso...@intel.com
The err label in register_slot() is only jumped to from one place,
so move the code under the label to that place and drop the label.
Signed-off-by: Rafael J. Wysocki rafael.j.wyso...@intel.com
Tested-by: Mika Westerberg mika.westerb...@linux.intel.com
---
drivers/pci/hotplug/acpiphp_glue.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
Index: linux-pm/drivers/pci/hotplug/acpiphp_glue.c
===
--- linux-pm.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-pm/drivers/pci/hotplug/acpiphp_glue.c
@@ -335,8 +335,10 @@ static acpi_status register_slot(acpi_ha
slot = kzalloc(sizeof(struct acpiphp_slot), GFP_KERNEL);
if (!slot) {
- status = AE_NO_MEMORY;
- goto err;
+ mutex_lock(acpiphp_context_lock);
+ acpiphp_put_context(context);
+ mutex_unlock(acpiphp_context_lock);
+ return AE_NO_MEMORY;
}
slot-bus = bridge-pci_bus;
@@ -404,12 +406,6 @@ static acpi_status register_slot(acpi_ha
}
return AE_OK;
-
- err:
- mutex_lock(acpiphp_context_lock);
- acpiphp_put_context(context);
- mutex_unlock(acpiphp_context_lock);
- return status;
}
static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle)
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
