ACPICA: Expand device initialization counters to 32 bits

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

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>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index 0e2c66af3c9d..6e5dd97949fe 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -201,11 +201,11 @@ struct acpi_evaluate_info {
 /* Info used by acpi_ns_initialize_devices */
 
 struct acpi_device_walk_info {
-        u16 device_count;
-        u16 num_STA;
-        u16 num_INI;
         struct acpi_table_desc *table_desc;
         struct acpi_evaluate_info *evaluate_info;
+        u32 device_count;
+        u32 num_STA;
+        u32 num_INI;
 };
 
 /* TBD: [Restructure] Merge with struct above */
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 88145820d887..f0e49df7c13b 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -208,8 +208,8 @@ acpi_status acpi_ns_initialize_devices(void)
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                              "\nExecuted %hd _INI methods requiring %hd _STA executions "
-                              "(examined %hd objects)\n",
+                              "\nExecuted %u _INI methods requiring %u _STA executions "
+                              "(examined %u objects)\n",
                               info.num_INI, info.num_STA, info.device_count));
 
         return_ACPI_STATUS(status);