Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / drivers / acpi / acpica / dsinit.c

diff --git a/drivers/acpi/acpica/dsinit.c b/drivers/acpi/acpica/dsinit.c
index abe140318a74db1f7f2d51f76bd3f1134a159a73..cc4a38c5755824f758a51e466c033c2b3440dd8a 100644 (file)
--- 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);