summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-02-21 13:16:30 -0800
committerFurquan Shaikh <furquan@google.com>2017-02-22 22:19:19 +0100
commit5b9b593f2f888c81cc0af8eb2fc2173c83562003 (patch)
treefb37a6b896196713305ae305e53c1f42d536f209 /src/drivers
parenteae492657797636d99f8ebef75f46237bd39b56b (diff)
acpi: Add ACPI_ prefix to IRQ enum and struct names
This is done to avoid any conflicts with same IRQ enums defined by other drivers. BUG=None BRANCH=None TEST=Compiles successfully Change-Id: I539831d853286ca45f6c36c3812a6fa9602df24c Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/18444 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/pc80/tpm/tpm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tpm.c
index 3c3e491aa3..0fdf548868 100644
--- a/src/drivers/pc80/tpm/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c
@@ -936,22 +936,22 @@ static void lpc_tpm_fill_ssdt(struct device *dev)
* PIRQ: Update interrupt vector with configured PIRQ
* Active-Low Level-Triggered Shared
*/
- struct acpi_irq tpm_irq_a = IRQ_LEVEL_LOW(CONFIG_TPM_PIRQ);
+ struct acpi_irq tpm_irq_a = ACPI_IRQ_LEVEL_LOW(CONFIG_TPM_PIRQ);
acpi_device_write_interrupt(&tpm_irq_a);
} else if (tpm_read_int_vector(0) > 0) {
u8 int_vec = tpm_read_int_vector(0);
u8 int_pol = tpm_read_int_polarity(0);
- struct acpi_irq tpm_irq = IRQ_LEVEL_LOW(int_vec);
+ struct acpi_irq tpm_irq = ACPI_IRQ_LEVEL_LOW(int_vec);
if (int_pol & 1)
- tpm_irq.polarity = IRQ_ACTIVE_LOW;
+ tpm_irq.polarity = ACPI_IRQ_ACTIVE_LOW;
else
- tpm_irq.polarity = IRQ_ACTIVE_HIGH;
+ tpm_irq.polarity = ACPI_IRQ_ACTIVE_HIGH;
if (int_pol & 2)
- tpm_irq.mode = IRQ_EDGE_TRIGGERED;
+ tpm_irq.mode = ACPI_IRQ_EDGE_TRIGGERED;
else
- tpm_irq.mode = IRQ_LEVEL_TRIGGERED;
+ tpm_irq.mode = ACPI_IRQ_LEVEL_TRIGGERED;
acpi_device_write_interrupt(&tpm_irq);
}