diff options
-rw-r--r-- | drivers/acpi/acpica/dsmethod.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/dsmthdat.c | 10 | ||||
-rw-r--r-- | drivers/acpi/acpica/dsutils.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/exdump.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/exfldio.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/exprep.c | 14 | ||||
-rw-r--r-- | drivers/acpi/acpica/exregion.c | 6 | ||||
-rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/nsaccess.c | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/nsdump.c | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/nsparse.c | 4 |
11 files changed, 28 insertions, 28 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 2a9a561c2f01..00846333773e 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c | |||
@@ -605,7 +605,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc, | |||
605 | * we immediately reuse it for the next thread executing this method | 605 | * we immediately reuse it for the next thread executing this method |
606 | */ | 606 | */ |
607 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, | 607 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, |
608 | "*** Completed execution of one thread, %d threads remaining\n", | 608 | "*** Completed execution of one thread, %u threads remaining\n", |
609 | method_desc->method.thread_count)); | 609 | method_desc->method.thread_count)); |
610 | } else { | 610 | } else { |
611 | /* This is the only executing thread for this method */ | 611 | /* This is the only executing thread for this method */ |
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c index f3d52f59250b..d5e927f818a0 100644 --- a/drivers/acpi/acpica/dsmthdat.c +++ b/drivers/acpi/acpica/dsmthdat.c | |||
@@ -146,7 +146,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state) | |||
146 | 146 | ||
147 | for (index = 0; index < ACPI_METHOD_NUM_LOCALS; index++) { | 147 | for (index = 0; index < ACPI_METHOD_NUM_LOCALS; index++) { |
148 | if (walk_state->local_variables[index].object) { | 148 | if (walk_state->local_variables[index].object) { |
149 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Deleting Local%d=%p\n", | 149 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Deleting Local%u=%p\n", |
150 | index, | 150 | index, |
151 | walk_state->local_variables[index]. | 151 | walk_state->local_variables[index]. |
152 | object)); | 152 | object)); |
@@ -162,7 +162,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state) | |||
162 | 162 | ||
163 | for (index = 0; index < ACPI_METHOD_NUM_ARGS; index++) { | 163 | for (index = 0; index < ACPI_METHOD_NUM_ARGS; index++) { |
164 | if (walk_state->arguments[index].object) { | 164 | if (walk_state->arguments[index].object) { |
165 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Deleting Arg%d=%p\n", | 165 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Deleting Arg%u=%p\n", |
166 | index, | 166 | index, |
167 | walk_state->arguments[index].object)); | 167 | walk_state->arguments[index].object)); |
168 | 168 | ||
@@ -226,7 +226,7 @@ acpi_ds_method_data_init_args(union acpi_operand_object **params, | |||
226 | index++; | 226 | index++; |
227 | } | 227 | } |
228 | 228 | ||
229 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%d args passed to method\n", index)); | 229 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%u args passed to method\n", index)); |
230 | return_ACPI_STATUS(AE_OK); | 230 | return_ACPI_STATUS(AE_OK); |
231 | } | 231 | } |
232 | 232 | ||
@@ -323,7 +323,7 @@ acpi_ds_method_data_set_value(u8 type, | |||
323 | ACPI_FUNCTION_TRACE(ds_method_data_set_value); | 323 | ACPI_FUNCTION_TRACE(ds_method_data_set_value); |
324 | 324 | ||
325 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, | 325 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, |
326 | "NewObj %p Type %2.2X, Refs=%d [%s]\n", object, | 326 | "NewObj %p Type %2.2X, Refs=%u [%s]\n", object, |
327 | type, object->common.reference_count, | 327 | type, object->common.reference_count, |
328 | acpi_ut_get_type_name(object->common.type))); | 328 | acpi_ut_get_type_name(object->common.type))); |
329 | 329 | ||
@@ -543,7 +543,7 @@ acpi_ds_store_object_to_local(u8 type, | |||
543 | union acpi_operand_object *new_obj_desc; | 543 | union acpi_operand_object *new_obj_desc; |
544 | 544 | ||
545 | ACPI_FUNCTION_TRACE(ds_store_object_to_local); | 545 | ACPI_FUNCTION_TRACE(ds_store_object_to_local); |
546 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Type=%2.2X Index=%d Obj=%p\n", | 546 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Type=%2.2X Index=%u Obj=%p\n", |
547 | type, index, obj_desc)); | 547 | type, index, obj_desc)); |
548 | 548 | ||
549 | /* Parameter validation */ | 549 | /* Parameter validation */ |
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c index 306c62ab2e88..15135c25aa9b 100644 --- a/drivers/acpi/acpica/dsutils.c +++ b/drivers/acpi/acpica/dsutils.c | |||
@@ -746,7 +746,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state, | |||
746 | index--; | 746 | index--; |
747 | 747 | ||
748 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, | 748 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, |
749 | "Arg #%d (%p) done, Arg1=%p\n", index, arg, | 749 | "Arg #%u (%p) done, Arg1=%p\n", index, arg, |
750 | first_arg)); | 750 | first_arg)); |
751 | } | 751 | } |
752 | 752 | ||
@@ -760,7 +760,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state, | |||
760 | */ | 760 | */ |
761 | acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); | 761 | acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state); |
762 | 762 | ||
763 | ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %d", index)); | 763 | ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %u", index)); |
764 | return_ACPI_STATUS(status); | 764 | return_ACPI_STATUS(status); |
765 | } | 765 | } |
766 | 766 | ||
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c index d39d438ba1e3..cdb66d1e3fde 100644 --- a/drivers/acpi/acpica/exdump.c +++ b/drivers/acpi/acpica/exdump.c | |||
@@ -742,7 +742,7 @@ acpi_ex_dump_operands(union acpi_operand_object **operands, | |||
742 | } | 742 | } |
743 | 743 | ||
744 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, | 744 | ACPI_DEBUG_PRINT((ACPI_DB_EXEC, |
745 | "**** Start operand dump for opcode [%s], %d operands\n", | 745 | "**** Start operand dump for opcode [%s], %u operands\n", |
746 | opcode_name, num_operands)); | 746 | opcode_name, num_operands)); |
747 | 747 | ||
748 | if (num_operands == 0) { | 748 | if (num_operands == 0) { |
@@ -945,7 +945,7 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc, | |||
945 | 945 | ||
946 | case ACPI_TYPE_PACKAGE: | 946 | case ACPI_TYPE_PACKAGE: |
947 | 947 | ||
948 | acpi_os_printf("[Package] Contains %d Elements:\n", | 948 | acpi_os_printf("[Package] Contains %u Elements:\n", |
949 | obj_desc->package.count); | 949 | obj_desc->package.count); |
950 | 950 | ||
951 | for (i = 0; i < obj_desc->package.count; i++) { | 951 | for (i = 0; i < obj_desc->package.count; i++) { |
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c index a6dc26f0b3be..047217303a4b 100644 --- a/drivers/acpi/acpica/exfldio.c +++ b/drivers/acpi/acpica/exfldio.c | |||
@@ -534,13 +534,13 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc, | |||
534 | if (ACPI_SUCCESS(status)) { | 534 | if (ACPI_SUCCESS(status)) { |
535 | if (read_write == ACPI_READ) { | 535 | if (read_write == ACPI_READ) { |
536 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 536 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
537 | "Value Read %8.8X%8.8X, Width %d\n", | 537 | "Value Read %8.8X%8.8X, Width %u\n", |
538 | ACPI_FORMAT_UINT64(*value), | 538 | ACPI_FORMAT_UINT64(*value), |
539 | obj_desc->common_field. | 539 | obj_desc->common_field. |
540 | access_byte_width)); | 540 | access_byte_width)); |
541 | } else { | 541 | } else { |
542 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 542 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
543 | "Value Written %8.8X%8.8X, Width %d\n", | 543 | "Value Written %8.8X%8.8X, Width %u\n", |
544 | ACPI_FORMAT_UINT64(*value), | 544 | ACPI_FORMAT_UINT64(*value), |
545 | obj_desc->common_field. | 545 | obj_desc->common_field. |
546 | access_byte_width)); | 546 | access_byte_width)); |
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c index 25059dace0ad..0686f271c61e 100644 --- a/drivers/acpi/acpica/exprep.c +++ b/drivers/acpi/acpica/exprep.c | |||
@@ -108,11 +108,11 @@ acpi_ex_generate_access(u32 field_bit_offset, | |||
108 | field_byte_length = field_byte_end_offset - field_byte_offset; | 108 | field_byte_length = field_byte_end_offset - field_byte_offset; |
109 | 109 | ||
110 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 110 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
111 | "Bit length %d, Bit offset %d\n", | 111 | "Bit length %u, Bit offset %u\n", |
112 | field_bit_length, field_bit_offset)); | 112 | field_bit_length, field_bit_offset)); |
113 | 113 | ||
114 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 114 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
115 | "Byte Length %d, Byte Offset %d, End Offset %d\n", | 115 | "Byte Length %u, Byte Offset %u, End Offset %u\n", |
116 | field_byte_length, field_byte_offset, | 116 | field_byte_length, field_byte_offset, |
117 | field_byte_end_offset)); | 117 | field_byte_end_offset)); |
118 | 118 | ||
@@ -147,11 +147,11 @@ acpi_ex_generate_access(u32 field_bit_offset, | |||
147 | accesses = field_end_offset - field_start_offset; | 147 | accesses = field_end_offset - field_start_offset; |
148 | 148 | ||
149 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 149 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
150 | "AccessWidth %d end is within region\n", | 150 | "AccessWidth %u end is within region\n", |
151 | access_byte_width)); | 151 | access_byte_width)); |
152 | 152 | ||
153 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 153 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
154 | "Field Start %d, Field End %d -- requires %d accesses\n", | 154 | "Field Start %u, Field End %u -- requires %u accesses\n", |
155 | field_start_offset, field_end_offset, | 155 | field_start_offset, field_end_offset, |
156 | accesses)); | 156 | accesses)); |
157 | 157 | ||
@@ -159,7 +159,7 @@ acpi_ex_generate_access(u32 field_bit_offset, | |||
159 | 159 | ||
160 | if (accesses <= 1) { | 160 | if (accesses <= 1) { |
161 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 161 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
162 | "Entire field can be accessed with one operation of size %d\n", | 162 | "Entire field can be accessed with one operation of size %u\n", |
163 | access_byte_width)); | 163 | access_byte_width)); |
164 | return_VALUE(access_byte_width); | 164 | return_VALUE(access_byte_width); |
165 | } | 165 | } |
@@ -174,7 +174,7 @@ acpi_ex_generate_access(u32 field_bit_offset, | |||
174 | } | 174 | } |
175 | } else { | 175 | } else { |
176 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 176 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
177 | "AccessWidth %d end is NOT within region\n", | 177 | "AccessWidth %u end is NOT within region\n", |
178 | access_byte_width)); | 178 | access_byte_width)); |
179 | if (access_byte_width == 1) { | 179 | if (access_byte_width == 1) { |
180 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 180 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
@@ -190,7 +190,7 @@ acpi_ex_generate_access(u32 field_bit_offset, | |||
190 | * previous access | 190 | * previous access |
191 | */ | 191 | */ |
192 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 192 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
193 | "Backing off to previous optimal access width of %d\n", | 193 | "Backing off to previous optimal access width of %u\n", |
194 | minimum_access_width)); | 194 | minimum_access_width)); |
195 | return_VALUE(minimum_access_width); | 195 | return_VALUE(minimum_access_width); |
196 | } | 196 | } |
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c index 531000fc77d2..8819d2ac5aee 100644 --- a/drivers/acpi/acpica/exregion.c +++ b/drivers/acpi/acpica/exregion.c | |||
@@ -194,7 +194,7 @@ acpi_ex_system_memory_space_handler(u32 function, | |||
194 | ((u64) address - (u64) mem_info->mapped_physical_address); | 194 | ((u64) address - (u64) mem_info->mapped_physical_address); |
195 | 195 | ||
196 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 196 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
197 | "System-Memory (width %d) R/W %d Address=%8.8X%8.8X\n", | 197 | "System-Memory (width %u) R/W %u Address=%8.8X%8.8X\n", |
198 | bit_width, function, | 198 | bit_width, function, |
199 | ACPI_FORMAT_NATIVE_UINT(address))); | 199 | ACPI_FORMAT_NATIVE_UINT(address))); |
200 | 200 | ||
@@ -297,7 +297,7 @@ acpi_ex_system_io_space_handler(u32 function, | |||
297 | ACPI_FUNCTION_TRACE(ex_system_io_space_handler); | 297 | ACPI_FUNCTION_TRACE(ex_system_io_space_handler); |
298 | 298 | ||
299 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 299 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
300 | "System-IO (width %d) R/W %d Address=%8.8X%8.8X\n", | 300 | "System-IO (width %u) R/W %u Address=%8.8X%8.8X\n", |
301 | bit_width, function, | 301 | bit_width, function, |
302 | ACPI_FORMAT_NATIVE_UINT(address))); | 302 | ACPI_FORMAT_NATIVE_UINT(address))); |
303 | 303 | ||
@@ -373,7 +373,7 @@ acpi_ex_pci_config_space_handler(u32 function, | |||
373 | pci_register = (u16) (u32) address; | 373 | pci_register = (u16) (u32) address; |
374 | 374 | ||
375 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 375 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
376 | "Pci-Config %d (%d) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n", | 376 | "Pci-Config %u (%u) Seg(%04x) Bus(%04x) Dev(%04x) Func(%04x) Reg(%04x)\n", |
377 | function, bit_width, pci_id->segment, pci_id->bus, | 377 | function, bit_width, pci_id->segment, pci_id->bus, |
378 | pci_id->device, pci_id->function, pci_register)); | 378 | pci_id->device, pci_id->function, pci_register)); |
379 | 379 | ||
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 36eb803dd9d0..3796811276ac 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c | |||
@@ -307,7 +307,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
307 | return_ACPI_STATUS(status); | 307 | return_ACPI_STATUS(status); |
308 | } | 308 | } |
309 | ACPI_DEBUG_PRINT((ACPI_DB_INIT, | 309 | ACPI_DEBUG_PRINT((ACPI_DB_INIT, |
310 | "Entering sleep state [S%d]\n", sleep_state)); | 310 | "Entering sleep state [S%u]\n", sleep_state)); |
311 | 311 | ||
312 | /* Clear the SLP_EN and SLP_TYP fields */ | 312 | /* Clear the SLP_EN and SLP_TYP fields */ |
313 | 313 | ||
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c index 3a2814676ac3..2cebfa94b79a 100644 --- a/drivers/acpi/acpica/nsaccess.c +++ b/drivers/acpi/acpica/nsaccess.c | |||
@@ -433,7 +433,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
433 | 433 | ||
434 | if (search_parent_flag == ACPI_NS_NO_UPSEARCH) { | 434 | if (search_parent_flag == ACPI_NS_NO_UPSEARCH) { |
435 | ACPI_DEBUG_PRINT((ACPI_DB_NAMES, | 435 | ACPI_DEBUG_PRINT((ACPI_DB_NAMES, |
436 | "Search scope is [%4.4s], path has %d carat(s)\n", | 436 | "Search scope is [%4.4s], path has %u carat(s)\n", |
437 | acpi_ut_get_node_name | 437 | acpi_ut_get_node_name |
438 | (this_node), num_carats)); | 438 | (this_node), num_carats)); |
439 | } | 439 | } |
@@ -495,7 +495,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
495 | path++; | 495 | path++; |
496 | 496 | ||
497 | ACPI_DEBUG_PRINT((ACPI_DB_NAMES, | 497 | ACPI_DEBUG_PRINT((ACPI_DB_NAMES, |
498 | "Multi Pathname (%d Segments, Flags=%X)\n", | 498 | "Multi Pathname (%u Segments, Flags=%X)\n", |
499 | num_segments, flags)); | 499 | num_segments, flags)); |
500 | break; | 500 | break; |
501 | 501 | ||
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c index 2110cc2360f0..a54dc39e304b 100644 --- a/drivers/acpi/acpica/nsdump.c +++ b/drivers/acpi/acpica/nsdump.c | |||
@@ -441,7 +441,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle, | |||
441 | return (AE_OK); | 441 | return (AE_OK); |
442 | } | 442 | } |
443 | 443 | ||
444 | acpi_os_printf("(R%d)", obj_desc->common.reference_count); | 444 | acpi_os_printf("(R%u)", obj_desc->common.reference_count); |
445 | 445 | ||
446 | switch (type) { | 446 | switch (type) { |
447 | case ACPI_TYPE_METHOD: | 447 | case ACPI_TYPE_METHOD: |
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c index 27cda52c76bc..5808c89e9fac 100644 --- a/drivers/acpi/acpica/nsparse.c +++ b/drivers/acpi/acpica/nsparse.c | |||
@@ -136,8 +136,8 @@ acpi_ns_one_complete_parse(u32 pass_number, | |||
136 | 136 | ||
137 | /* Parse the AML */ | 137 | /* Parse the AML */ |
138 | 138 | ||
139 | ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "*PARSE* pass %d parse\n", | 139 | ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "*PARSE* pass %u parse\n", |
140 | (unsigned)pass_number)); | 140 | pass_number)); |
141 | status = acpi_ps_parse_aml(walk_state); | 141 | status = acpi_ps_parse_aml(walk_state); |
142 | 142 | ||
143 | cleanup: | 143 | cleanup: |