ACPICA: Clarify/rename some root table descriptor fields

Original fields were not very descriptive and led to maintenance
problems.  New fields should help to understand the existing code.

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, 15 insertions, 11 deletions

diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index adb7f56b853e..4a8b9e6ea57a 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -72,7 +72,7 @@ static int no_auto_ssdt;
 acpi_status acpi_allocate_root_table(u32 initial_table_count)
 {
 
-        acpi_gbl_root_table_list.size = initial_table_count;
+        acpi_gbl_root_table_list.max_table_count = initial_table_count;
         acpi_gbl_root_table_list.flags = ACPI_ROOT_ALLOW_RESIZE;
 
         return (acpi_tb_resize_root_table_list());
@@ -130,7 +130,7 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
                             sizeof(struct acpi_table_desc));
 
                 acpi_gbl_root_table_list.tables = initial_table_array;
-                acpi_gbl_root_table_list.size = initial_table_count;
+                acpi_gbl_root_table_list.max_table_count = initial_table_count;
                 acpi_gbl_root_table_list.flags = ACPI_ROOT_ORIGIN_UNKNOWN;
                 if (allow_resize) {
                         acpi_gbl_root_table_list.flags |=
@@ -189,7 +189,8 @@ acpi_status acpi_reallocate_root_table(void)
          * increment to create the new table size.
          */
         current_size = (acpi_size)
-            acpi_gbl_root_table_list.count * sizeof(struct acpi_table_desc);
+            acpi_gbl_root_table_list.current_table_count *
+            sizeof(struct acpi_table_desc);
 
         new_size = current_size +
             (ACPI_ROOT_TABLE_SIZE_INCREMENT * sizeof(struct acpi_table_desc));
@@ -209,8 +210,9 @@ acpi_status acpi_reallocate_root_table(void)
          * size of the original table list.
          */
         acpi_gbl_root_table_list.tables = tables;
-        acpi_gbl_root_table_list.size =
-            acpi_gbl_root_table_list.count + ACPI_ROOT_TABLE_SIZE_INCREMENT;
+        acpi_gbl_root_table_list.max_table_count =
+            acpi_gbl_root_table_list.current_table_count +
+            ACPI_ROOT_TABLE_SIZE_INCREMENT;
         acpi_gbl_root_table_list.flags =
             ACPI_ROOT_ORIGIN_ALLOCATED | ACPI_ROOT_ALLOW_RESIZE;
 
@@ -291,7 +293,8 @@ acpi_get_table_header(char *signature,
 
         /* Walk the root table list */
 
-        for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
+        for (i = 0, j = 0; i < acpi_gbl_root_table_list.current_table_count;
+             i++) {
                 if (!ACPI_COMPARE_NAME
                     (&(acpi_gbl_root_table_list.tables[i].signature),
                      signature)) {
@@ -354,7 +357,7 @@ acpi_status acpi_unload_table_id(acpi_owner_id id)
         ACPI_FUNCTION_TRACE(acpi_unload_table_id);
 
         /* Find table in the global table list */
-        for (i = 0; i < acpi_gbl_root_table_list.count; ++i) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
                 if (id != acpi_gbl_root_table_list.tables[i].owner_id) {
                         continue;
                 }
@@ -404,7 +407,8 @@ acpi_get_table_with_size(char *signature,
 
         /* Walk the root table list */
 
-        for (i = 0, j = 0; i < acpi_gbl_root_table_list.count; i++) {
+        for (i = 0, j = 0; i < acpi_gbl_root_table_list.current_table_count;
+             i++) {
                 if (!ACPI_COMPARE_NAME
                     (&(acpi_gbl_root_table_list.tables[i].signature),
                      signature)) {
@@ -472,7 +476,7 @@ acpi_get_table_by_index(u32 table_index, struct acpi_table_header **table)
 
         /* Validate index */
 
-        if (table_index >= acpi_gbl_root_table_list.count) {
+        if (table_index >= acpi_gbl_root_table_list.current_table_count) {
                 (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
@@ -523,7 +527,7 @@ static acpi_status acpi_tb_load_namespace(void)
          * Load the namespace. The DSDT is required, but any SSDT and
          * PSDT tables are optional. Verify the DSDT.
          */
-        if (!acpi_gbl_root_table_list.count ||
+        if (!acpi_gbl_root_table_list.current_table_count ||
             !ACPI_COMPARE_NAME(&
                                (acpi_gbl_root_table_list.
                                 tables[ACPI_TABLE_INDEX_DSDT].signature),
@@ -577,7 +581,7 @@ static acpi_status acpi_tb_load_namespace(void)
         /* 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) {
+        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
                 if ((!ACPI_COMPARE_NAME
                      (&(acpi_gbl_root_table_list.tables[i].signature),
                       ACPI_SIG_SSDT)