ACPICA: Update for new gcc-4 warning options

Added several new options for the gcc-4 generation, and updated
the source accordingly. This includes some code restructuring to
eliminate unreachable code, elimination of some gotos, elimination
of unused return values, and some additional casting.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 46adfa541cbc..2ea8daccba1c 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -490,7 +490,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
         status = acpi_tb_add_table(&table_desc, &table_index);
         if (ACPI_FAILURE(status)) {
-                goto cleanup;
+
+                /* Delete allocated table buffer */
+
+                acpi_tb_delete_table(&table_desc);
+                return_ACPI_STATUS(status);
         }
 
         /*
@@ -533,13 +537,6 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                                              acpi_gbl_table_handler_context);
         }
 
-      cleanup:
-        if (ACPI_FAILURE(status)) {
-
-                /* Delete allocated table buffer */
-
-                acpi_tb_delete_table(&table_desc);
-        }
         return_ACPI_STATUS(status);
 }