UPSTREAM: acpi_device: Prefix IRQ macros with ACPI

Switch some IRQ_* macros to ACPI_IRQ_* instead so they do not
fail at compile time if they are used.

BUG=b:35581264
BRANCH=none
TEST=successfully compile with ACPI_GPIO_IRQ_LEVEL_HIGH

Change-Id: I372c4844904081fa76d0cbc9ea34e156f6401ba7
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 9462e14065
Original-Change-Id: Id4040eca4c7c9d8f7b4f0add411d5d6fe5ed1eb8
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/18833
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Original-Tested-by: build bot (Jenkins)
Reviewed-on: https://chromium-review.googlesource.com/456302
This commit is contained in:
Duncan Laurie 2017-03-15 11:12:17 -07:00 committed by chrome-bot
commit 99a672c065

View file

@ -195,8 +195,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_EDGE_LOW(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \
.irq.mode = IRQ_EDGE_TRIGGERED, \
.irq.polarity = IRQ_ACTIVE_LOW, \
.irq.mode = ACPI_IRQ_EDGE_TRIGGERED, \
.irq.polarity = ACPI_IRQ_ACTIVE_LOW, \
.pin_count = 1, \
.pins = { (gpio) } }
@ -204,8 +204,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_LEVEL_HIGH(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \
.irq.mode = IRQ_LEVEL_TRIGGERED, \
.irq.polarity = IRQ_ACTIVE_HIGH, \
.irq.mode = ACPI_IRQ_LEVEL_TRIGGERED, \
.irq.polarity = ACPI_IRQ_ACTIVE_HIGH, \
.pin_count = 1, \
.pins = { (gpio) } }
@ -213,8 +213,8 @@ struct acpi_gpio {
#define ACPI_GPIO_IRQ_LEVEL_LOW(gpio) { \
.type = ACPI_GPIO_TYPE_INTERRUPT, \
.pull = ACPI_GPIO_PULL_DEFAULT, \
.irq.mode = IRQ_LEVEL_TRIGGERED, \
.irq.polarity = IRQ_ACTIVE_LOW, \
.irq.mode = ACPI_IRQ_LEVEL_TRIGGERED, \
.irq.polarity = ACPI_IRQ_ACTIVE_LOW, \
.pin_count = 1, \
.pins = { (gpio) } }