diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2018-03-14 16:13:05 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-03-18 18:52:00 +0100 |
| commit | 0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6 (patch) | |
| tree | d466b2bbeca9fcf3c076605a253c2906b8a9d5f6 /drivers/acpi/acpica/evgpeblk.c | |
| parent | 34f206fd757c5061a67d879a74c300fafc34defb (diff) | |
| download | op-kernel-dev-0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6.zip op-kernel-dev-0fe0bebf5fb905ae682b1ecfd0b51b3a89e45ee6.tar.gz | |
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>
Diffstat (limited to 'drivers/acpi/acpica/evgpeblk.c')
| -rw-r--r-- | drivers/acpi/acpica/evgpeblk.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c index 107f3ec..b9139ca 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, struct acpi_gpe_event_info *gpe_event_info; u32 gpe_enabled_count; u32 gpe_index; - u32 gpe_number; u32 i; u32 j; u8 *is_polling_needed = context; + ACPI_ERROR_ONLY(u32 gpe_number); ACPI_FUNCTION_TRACE(ev_initialize_gpe_block); @@ -472,7 +472,9 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j; gpe_event_info = &gpe_block->event_info[gpe_index]; - gpe_number = gpe_block->block_base_number + gpe_index; + ACPI_ERROR_ONLY(gpe_number = + gpe_block->block_base_number + + gpe_index); gpe_event_info->flags |= ACPI_GPE_INITIALIZED; /* |
