ACPICA: Fix issues with arg types within printf format strings

ACPICA commit db2638ccaac84b61e92f34d60c3630ff5217f852

Link: https://github.com/acpica/acpica/commit/db2638cc
Link: https://github.com/acpica/acpica/commit/634c3085
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/dbhistry.c b/drivers/acpi/acpica/dbhistry.c
index 7809bd9..47d2e50 100644 (file)
--- a/drivers/acpi/acpica/dbhistry.c
+++ b/drivers/acpi/acpica/dbhistry.c
@@ -121,7 +121,7 @@ void acpi_db_display_history(void)
 
        for (i = 0; i < acpi_gbl_num_history; i++) {
                if (acpi_gbl_history_buffer[history_index].command) {
-                       acpi_os_printf("%3ld %s\n",
+                       acpi_os_printf("%3u %s\n",
                                       acpi_gbl_history_buffer[history_index].
                                       cmd_num,
                                       acpi_gbl_history_buffer[history_index].

diff --git a/drivers/acpi/acpica/dbinput.c b/drivers/acpi/acpica/dbinput.c
index 3e5f953..32e4f0c 100644 (file)
--- a/drivers/acpi/acpica/dbinput.c
+++ b/drivers/acpi/acpica/dbinput.c
@@ -593,7 +593,7 @@ static u32 acpi_db_get_line(char *input_buffer)
             input_buffer)) {
                acpi_os_printf
                    ("Buffer overflow while parsing input line (max %u characters)\n",
-                    sizeof(acpi_gbl_db_parsed_buf));
+                    (u32)sizeof(acpi_gbl_db_parsed_buf));
                return (0);
        }
 

diff --git a/drivers/acpi/acpica/dbstats.c b/drivers/acpi/acpica/dbstats.c
index bf62093..4f00351 100644 (file)
--- a/drivers/acpi/acpica/dbstats.c
+++ b/drivers/acpi/acpica/dbstats.c
@@ -341,17 +341,17 @@ acpi_status acpi_db_display_statistics(char *type_arg)
                               "ACPI_TYPE", "NODES", "OBJECTS");
 
                for (i = 0; i < ACPI_TYPE_NS_NODE_MAX; i++) {
-                       acpi_os_printf("%16.16s % 10ld% 10ld\n",
+                       acpi_os_printf("%16.16s % 10u% 10u\n",
                                       acpi_ut_get_type_name(i),
                                       acpi_gbl_node_type_count[i],
                                       acpi_gbl_obj_type_count[i]);
                }
 
-               acpi_os_printf("%16.16s % 10ld% 10ld\n", "Misc/Unknown",
+               acpi_os_printf("%16.16s % 10u% 10u\n", "Misc/Unknown",
                               acpi_gbl_node_type_count_misc,
                               acpi_gbl_obj_type_count_misc);
 
-               acpi_os_printf("%16.16s % 10ld% 10ld\n", "TOTALS:",
+               acpi_os_printf("%16.16s % 10u% 10u\n", "TOTALS:",
                               acpi_gbl_num_nodes, acpi_gbl_num_objects);
                break;
 
@@ -379,18 +379,16 @@ acpi_status acpi_db_display_statistics(char *type_arg)
        case CMD_STAT_MISC:
 
                acpi_os_printf("\nMiscellaneous Statistics:\n\n");
-               acpi_os_printf("Calls to AcpiPsFind:.. ........% 7ld\n",
-                              acpi_gbl_ps_find_count);
-               acpi_os_printf("Calls to AcpiNsLookup:..........% 7ld\n",
-                              acpi_gbl_ns_lookup_count);
+               acpi_os_printf("%-28s:     %7lu\n", "Calls to AcpiPsFind",
+                              (u64)acpi_gbl_ps_find_count);
+               acpi_os_printf("%-28s:     %7lu\n", "Calls to AcpiNsLookup",
+                              (u64)acpi_gbl_ns_lookup_count);
 
-               acpi_os_printf("\n");
-
-               acpi_os_printf("Mutex usage:\n\n");
+               acpi_os_printf("\nMutex usage:\n\n");
                for (i = 0; i < ACPI_NUM_MUTEX; i++) {
-                       acpi_os_printf("%-28s:     % 7ld\n",
+                       acpi_os_printf("%-28s:     %7lu\n",
                                       acpi_ut_get_mutex_name(i),
-                                      acpi_gbl_mutex_info[i].use_count);
+                                      (u64)acpi_gbl_mutex_info[i].use_count);
                }
                break;
 

diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 8d77625..663d85e 100644 (file)
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -126,7 +126,7 @@ static const struct acpi_repair_info acpi_ns_repairable_names[] = {
 
 #define ACPI_FDE_FIELD_COUNT        5
 #define ACPI_FDE_BYTE_BUFFER_SIZE   5
-#define ACPI_FDE_DWORD_BUFFER_SIZE  (ACPI_FDE_FIELD_COUNT * sizeof (u32))
+#define ACPI_FDE_DWORD_BUFFER_SIZE  (ACPI_FDE_FIELD_COUNT * (u32) sizeof (u32))
 
 /******************************************************************************
  *