Auto merge with /home/aegl/GIT/linus

1 files changed, 56 insertions, 41 deletions

diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index fede5804c783..e69d01d443d2 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -49,48 +49,14 @@
 #define _COMPONENT          ACPI_TABLES
          ACPI_MODULE_NAME    ("tbutils")
 
+/* Local prototypes */
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_tb_handle_to_object
- *
- * PARAMETERS:  table_id            - Id for which the function is searching
- *              table_desc          - Pointer to return the matching table
- *                                      descriptor.
- *
- * RETURN:      Search the tables to find one with a matching table_id and
- *              return a pointer to that table descriptor.
- *
- ******************************************************************************/
-#ifdef ACPI_FUTURE_USAGE
+#ifdef ACPI_OBSOLETE_FUNCTIONS
 acpi_status
 acpi_tb_handle_to_object (
         u16                             table_id,
-        struct acpi_table_desc          **return_table_desc)
-{
-        u32                             i;
-        struct acpi_table_desc          *table_desc;
-
-
-        ACPI_FUNCTION_NAME ("tb_handle_to_object");
-
-
-        for (i = 0; i < ACPI_TABLE_MAX; i++) {
-                table_desc = acpi_gbl_table_lists[i].next;
-                while (table_desc) {
-                        if (table_desc->table_id == table_id) {
-                                *return_table_desc = table_desc;
-                                return (AE_OK);
-                        }
-
-                        table_desc = table_desc->next;
-                }
-        }
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "table_id=%X does not exist\n", table_id));
-        return (AE_BAD_PARAMETER);
-}
-#endif  /*  ACPI_FUTURE_USAGE  */
+        struct acpi_table_desc          **table_desc);
+#endif
 
 
 /*******************************************************************************
@@ -128,6 +94,7 @@ acpi_tb_validate_table_header (
         if (!acpi_os_readable (table_header, sizeof (struct acpi_table_header))) {
                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                         "Cannot read table header at %p\n", table_header));
+
                 return (AE_BAD_ADDRESS);
         }
 
@@ -141,6 +108,7 @@ acpi_tb_validate_table_header (
 
                 ACPI_REPORT_WARNING (("Invalid table signature found: [%4.4s]\n",
                         (char *) &signature));
+
                 ACPI_DUMP_BUFFER (table_header, sizeof (struct acpi_table_header));
                 return (AE_BAD_SIGNATURE);
         }
@@ -154,6 +122,7 @@ acpi_tb_validate_table_header (
 
                 ACPI_REPORT_WARNING (("Invalid table header length (0x%X) found\n",
                         (u32) table_header->length));
+
                 ACPI_DUMP_BUFFER (table_header, sizeof (struct acpi_table_header));
                 return (AE_BAD_HEADER);
         }
@@ -193,8 +162,10 @@ acpi_tb_verify_table_checksum (
         /* Return the appropriate exception */
 
         if (checksum) {
-                ACPI_REPORT_WARNING (("Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)\n",
-                        table_header->signature, (u32) table_header->checksum, (u32) checksum));
+                ACPI_REPORT_WARNING ((
+                        "Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)\n",
+                        table_header->signature, (u32) table_header->checksum,
+                        (u32) checksum));
 
                 status = AE_BAD_CHECKSUM;
         }
@@ -209,7 +180,7 @@ acpi_tb_verify_table_checksum (
  * PARAMETERS:  Buffer              - Buffer to checksum
  *              Length              - Size of the buffer
  *
- * RETURNS      8 bit checksum of buffer
+ * RETURN:      8 bit checksum of buffer
  *
  * DESCRIPTION: Computes an 8 bit checksum of the buffer(length) and returns it.
  *
@@ -238,3 +209,47 @@ acpi_tb_checksum (
 }
 
 
+#ifdef ACPI_OBSOLETE_FUNCTIONS
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_tb_handle_to_object
+ *
+ * PARAMETERS:  table_id            - Id for which the function is searching
+ *              table_desc          - Pointer to return the matching table
+ *                                      descriptor.
+ *
+ * RETURN:      Search the tables to find one with a matching table_id and
+ *              return a pointer to that table descriptor.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_tb_handle_to_object (
+        u16                             table_id,
+        struct acpi_table_desc          **return_table_desc)
+{
+        u32                             i;
+        struct acpi_table_desc          *table_desc;
+
+
+        ACPI_FUNCTION_NAME ("tb_handle_to_object");
+
+
+        for (i = 0; i < ACPI_TABLE_MAX; i++) {
+                table_desc = acpi_gbl_table_lists[i].next;
+                while (table_desc) {
+                        if (table_desc->table_id == table_id) {
+                                *return_table_desc = table_desc;
+                                return (AE_OK);
+                        }
+
+                        table_desc = table_desc->next;
+                }
+        }
+
+        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "table_id=%X does not exist\n", table_id));
+        return (AE_BAD_PARAMETER);
+}
+#endif
+
+