1 files changed, 16 insertions, 21 deletions

diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 416d01d9a970..dbca22651504 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -246,7 +246,7 @@ acpi_status acpi_load_table(struct acpi_table_header *table_ptr)
 
 ACPI_EXPORT_SYMBOL(acpi_load_table)
 
-/******************************************************************************
+/*******************************************************************************
  *
  * FUNCTION:    acpi_get_table_header
  *
@@ -261,7 +261,7 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
  * NOTE:        Caller is responsible in unmapping the header with
  *              acpi_os_unmap_memory
  *
- *****************************************************************************/
+ ******************************************************************************/
 acpi_status
 acpi_get_table_header(char *signature,
                       u32 instance, struct acpi_table_header *out_table_header)
@@ -276,9 +276,8 @@ acpi_get_table_header(char *signature,
                 return (AE_BAD_PARAMETER);
         }
 
-        /*
-         * Walk the root table list
-         */
+        /* Walk the root table list */
+
         for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
                 if (!ACPI_COMPARE_NAME
                     (&(acpi_gbl_root_table_list.tables[i].signature),
@@ -291,8 +290,8 @@ acpi_get_table_header(char *signature,
                 }
 
                 if (!acpi_gbl_root_table_list.tables[i].pointer) {
-                        if ((acpi_gbl_root_table_list.tables[i].
-                             flags & ACPI_TABLE_ORIGIN_MASK) ==
+                        if ((acpi_gbl_root_table_list.tables[i].flags &
+                             ACPI_TABLE_ORIGIN_MASK) ==
                             ACPI_TABLE_ORIGIN_MAPPED) {
                                 header =
                                     acpi_os_map_memory(acpi_gbl_root_table_list.
@@ -323,7 +322,7 @@ acpi_get_table_header(char *signature,
 
 ACPI_EXPORT_SYMBOL(acpi_get_table_header)
 
-/******************************************************************************
+/*******************************************************************************
  *
  * FUNCTION:    acpi_unload_table_id
  *
@@ -374,7 +373,7 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
  *
  * DESCRIPTION: Finds and verifies an ACPI table.
  *
- *****************************************************************************/
+ ******************************************************************************/
 acpi_status
 acpi_get_table(char *signature,
                u32 instance, struct acpi_table_header **out_table)
@@ -389,9 +388,8 @@ acpi_get_table(char *signature,
                 return (AE_BAD_PARAMETER);
         }
 
-        /*
-         * Walk the root table list
-         */
+        /* Walk the root table list */
+
         for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
                 if (!ACPI_COMPARE_NAME
                     (&(acpi_gbl_root_table_list.tables[i].signature),
@@ -526,17 +524,15 @@ static acpi_status acpi_tb_load_namespace(void)
 
         (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
 
-        /*
-         * Load and parse tables.
-         */
+        /* Load and parse tables */
+
         status = acpi_ns_load_table(ACPI_TABLE_INDEX_DSDT, acpi_gbl_root_node);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        /*
-         * Load any SSDT or PSDT tables. Note: Loop leaves tables locked
-         */
+        /* Load any SSDT or PSDT tables. Note: Loop leaves tables locked */
+
         (void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
         for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
                 if ((!ACPI_COMPARE_NAME
@@ -589,9 +585,8 @@ acpi_status acpi_load_tables(void)
 
         ACPI_FUNCTION_TRACE(acpi_load_tables);
 
-        /*
-         * Load the namespace from the tables
-         */
+        /* Load the namespace from the tables */
+
         status = acpi_tb_load_namespace();
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,