ACPICA: Expand initialization counters to 32 bits

Expand the various initialization counters from 16-bit to 32-bit.
Allows for very large namespaces.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
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, 7 insertions, 7 deletions

diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index abe140318a74..cc4a38c57558 100644
--- a/drivers/acpi/acpica/dsinit.c
+++ b/drivers/acpi/acpica/dsinit.c
@@ -171,12 +171,12 @@ acpi_ds_initialize_objects(u32 table_index,
                           "**** Starting initialization of namespace objects ****\n"));
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "Parsing all Control Methods:"));
 
-        info.method_count = 0;
-        info.op_region_count = 0;
-        info.object_count = 0;
-        info.device_count = 0;
-        info.table_index = table_index;
+        /* Set all init info to zero */
+
+        ACPI_MEMSET(&info, 0, sizeof(struct acpi_init_walk_info));
+
         info.owner_id = owner_id;
+        info.table_index = table_index;
 
         /* Walk entire namespace from the supplied root */
 
@@ -204,13 +204,13 @@ acpi_ds_initialize_objects(u32 table_index,
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                              "\nTable [%4.4s](id %4.4X) - %hd Objects with %hd Devices %hd Methods %hd Regions\n",
+                              "\nTable [%4.4s](id %4.4X) - %u Objects with %u Devices %u Methods %u Regions\n",
                               table->signature, owner_id, info.object_count,
                               info.device_count, info.method_count,
                               info.op_region_count));
 
         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                          "%hd Methods, %hd Regions\n", info.method_count,
+                          "%u Methods, %u Regions\n", info.method_count,
                           info.op_region_count));
 
         return_ACPI_STATUS(AE_OK);