diff options
author | Erik Schmauss <erik.schmauss@intel.com> | 2018-03-14 19:13:05 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-03-18 13:52:00 -0400 |
commit | 0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6 (patch) | |
tree | d466b2bbeca9fcf3c076605a253c2906b8a9d5f6 | |
parent | 34f206fd757c5061a67d879a74c300fafc34defb (diff) |
ACPICA: macros: fix ACPI_ERROR_NAMESPACE macro
Fixing the ACPI_ERROR_NAMESPACE macros created an "unused variable"
compile error when ACPI_NO_ERROR_MESSAGES was defined. This commit
also fixes the above compilation errors by surrounding variables
meant for debugging inside a new ACPI_ERROR_ONLY macro.
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/acpica/acmacros.h | 4 | ||||
-rw-r--r-- | drivers/acpi/acpica/evgpeblk.c | 6 | ||||
-rw-r--r-- | drivers/acpi/acpica/psobject.c | 10 | ||||
-rw-r--r-- | drivers/acpi/acpica/tbinstal.c | 6 |
4 files changed, 16 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h index 6463340c4522..7e935403e4a4 100644 --- a/drivers/acpi/acpica/acmacros.h +++ b/drivers/acpi/acpica/acmacros.h | |||
@@ -460,16 +460,18 @@ | |||
460 | #define ACPI_WARN_PREDEFINED(plist) acpi_ut_predefined_warning plist | 460 | #define ACPI_WARN_PREDEFINED(plist) acpi_ut_predefined_warning plist |
461 | #define ACPI_INFO_PREDEFINED(plist) acpi_ut_predefined_info plist | 461 | #define ACPI_INFO_PREDEFINED(plist) acpi_ut_predefined_info plist |
462 | #define ACPI_BIOS_ERROR_PREDEFINED(plist) acpi_ut_predefined_bios_error plist | 462 | #define ACPI_BIOS_ERROR_PREDEFINED(plist) acpi_ut_predefined_bios_error plist |
463 | #define ACPI_ERROR_ONLY(s) s | ||
463 | 464 | ||
464 | #else | 465 | #else |
465 | 466 | ||
466 | /* No error messages */ | 467 | /* No error messages */ |
467 | 468 | ||
468 | #define ACPI_ERROR_NAMESPACE(s, e) | 469 | #define ACPI_ERROR_NAMESPACE(s, p, e) |
469 | #define ACPI_ERROR_METHOD(s, n, p, e) | 470 | #define ACPI_ERROR_METHOD(s, n, p, e) |
470 | #define ACPI_WARN_PREDEFINED(plist) | 471 | #define ACPI_WARN_PREDEFINED(plist) |
471 | #define ACPI_INFO_PREDEFINED(plist) | 472 | #define ACPI_INFO_PREDEFINED(plist) |
472 | #define ACPI_BIOS_ERROR_PREDEFINED(plist) | 473 | #define ACPI_BIOS_ERROR_PREDEFINED(plist) |
474 | #define ACPI_ERROR_ONLY(s) | ||
473 | 475 | ||
474 | #endif /* ACPI_NO_ERROR_MESSAGES */ | 476 | #endif /* ACPI_NO_ERROR_MESSAGES */ |
475 | 477 | ||
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c index 107f3ec5dee6..b9139ca1360e 100644 --- a/drivers/acpi/acpica/evgpeblk.c +++ b/drivers/acpi/acpica/evgpeblk.c | |||
@@ -443,10 +443,10 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, | |||
443 | struct acpi_gpe_event_info *gpe_event_info; | 443 | struct acpi_gpe_event_info *gpe_event_info; |
444 | u32 gpe_enabled_count; | 444 | u32 gpe_enabled_count; |
445 | u32 gpe_index; | 445 | u32 gpe_index; |
446 | u32 gpe_number; | ||
447 | u32 i; | 446 | u32 i; |
448 | u32 j; | 447 | u32 j; |
449 | u8 *is_polling_needed = context; | 448 | u8 *is_polling_needed = context; |
449 | ACPI_ERROR_ONLY(u32 gpe_number); | ||
450 | 450 | ||
451 | ACPI_FUNCTION_TRACE(ev_initialize_gpe_block); | 451 | ACPI_FUNCTION_TRACE(ev_initialize_gpe_block); |
452 | 452 | ||
@@ -472,7 +472,9 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, | |||
472 | 472 | ||
473 | gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j; | 473 | gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j; |
474 | gpe_event_info = &gpe_block->event_info[gpe_index]; | 474 | gpe_event_info = &gpe_block->event_info[gpe_index]; |
475 | gpe_number = gpe_block->block_base_number + gpe_index; | 475 | ACPI_ERROR_ONLY(gpe_number = |
476 | gpe_block->block_base_number + | ||
477 | gpe_index); | ||
476 | gpe_event_info->flags |= ACPI_GPE_INITIALIZED; | 478 | gpe_event_info->flags |= ACPI_GPE_INITIALIZED; |
477 | 479 | ||
478 | /* | 480 | /* |
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c index b18f1e048985..70e3ea933edc 100644 --- a/drivers/acpi/acpica/psobject.c +++ b/drivers/acpi/acpica/psobject.c | |||
@@ -67,7 +67,7 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state); | |||
67 | 67 | ||
68 | static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state) | 68 | static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state) |
69 | { | 69 | { |
70 | u32 aml_offset; | 70 | ACPI_ERROR_ONLY(u32 aml_offset); |
71 | 71 | ||
72 | ACPI_FUNCTION_TRACE_PTR(ps_get_aml_opcode, walk_state); | 72 | ACPI_FUNCTION_TRACE_PTR(ps_get_aml_opcode, walk_state); |
73 | 73 | ||
@@ -98,9 +98,11 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state) | |||
98 | /* The opcode is unrecognized. Complain and skip unknown opcodes */ | 98 | /* The opcode is unrecognized. Complain and skip unknown opcodes */ |
99 | 99 | ||
100 | if (walk_state->pass_number == 2) { | 100 | if (walk_state->pass_number == 2) { |
101 | aml_offset = (u32)ACPI_PTR_DIFF(walk_state->aml, | 101 | ACPI_ERROR_ONLY(aml_offset = |
102 | walk_state-> | 102 | (u32)ACPI_PTR_DIFF(walk_state->aml, |
103 | parser_state.aml_start); | 103 | walk_state-> |
104 | parser_state. | ||
105 | aml_start)); | ||
104 | 106 | ||
105 | ACPI_ERROR((AE_INFO, | 107 | ACPI_ERROR((AE_INFO, |
106 | "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring", | 108 | "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring", |
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c index 00be16da1ee2..95693e407372 100644 --- a/drivers/acpi/acpica/tbinstal.c +++ b/drivers/acpi/acpica/tbinstal.c | |||
@@ -231,11 +231,11 @@ release_and_exit: | |||
231 | void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) | 231 | void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) |
232 | { | 232 | { |
233 | acpi_status status; | 233 | acpi_status status; |
234 | char *override_type; | ||
235 | struct acpi_table_desc new_table_desc; | 234 | struct acpi_table_desc new_table_desc; |
236 | struct acpi_table_header *table; | 235 | struct acpi_table_header *table; |
237 | acpi_physical_address address; | 236 | acpi_physical_address address; |
238 | u32 length; | 237 | u32 length; |
238 | ACPI_ERROR_ONLY(char *override_type); | ||
239 | 239 | ||
240 | /* (1) Attempt logical override (returns a logical address) */ | 240 | /* (1) Attempt logical override (returns a logical address) */ |
241 | 241 | ||
@@ -244,7 +244,7 @@ void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) | |||
244 | acpi_tb_acquire_temp_table(&new_table_desc, | 244 | acpi_tb_acquire_temp_table(&new_table_desc, |
245 | ACPI_PTR_TO_PHYSADDR(table), | 245 | ACPI_PTR_TO_PHYSADDR(table), |
246 | ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL); | 246 | ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL); |
247 | override_type = "Logical"; | 247 | ACPI_ERROR_ONLY(override_type = "Logical"); |
248 | goto finish_override; | 248 | goto finish_override; |
249 | } | 249 | } |
250 | 250 | ||
@@ -255,7 +255,7 @@ void acpi_tb_override_table(struct acpi_table_desc *old_table_desc) | |||
255 | if (ACPI_SUCCESS(status) && address && length) { | 255 | if (ACPI_SUCCESS(status) && address && length) { |
256 | acpi_tb_acquire_temp_table(&new_table_desc, address, | 256 | acpi_tb_acquire_temp_table(&new_table_desc, address, |
257 | ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL); | 257 | ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL); |
258 | override_type = "Physical"; | 258 | ACPI_ERROR_ONLY(override_type = "Physical"); |
259 | goto finish_override; | 259 | goto finish_override; |
260 | } | 260 | } |
261 | 261 | ||