diff options
| author | Linus Torvalds | 2019-07-18 09:12:34 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-18 09:12:34 -0700 |
| commit | 4b09ddbcd107e280077bd3e918c8089dfa426980 (patch) | |
| tree | 7c9e455b592a0c0f3f8ba828bd4808376242ecdf /include/linux | |
| parent | 47d6a7607443ea43dbc4d0f371bf773540a8f8f4 (diff) | |
| parent | 2c66a5b52e9e328cd52af0d961f99a0e6717a065 (diff) | |
Merge tag 'acpi-5.3-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"These get rid of two clang warnings, add a new quirk mechanism to the
ACPI backlight driver (and apply it to one machine) and update the
table load object initialization in ACPICA (this is a replacement for
a previously reverted ACPICA commit).
Specifics:
- Make ACPI table loading work more consistently regardless of the
exact mechanism used for loading a table (Erik Schmauss).
- Get rid of two clang warnings (Arnd Bergmann).
- Add new quirk mechanism to the ACPI backlight driver and use it to
add a quirk for PB Easynote MZ35 (Hans de Goede)"
* tag 'acpi-5.3-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35
ACPI: fix false-positive -Wuninitialized warning
ACPI: blacklist: fix clang warning for unused DMI table
ACPICA: Update table load object initialization
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index a95cce5e82e7..9426b9aaed86 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -324,7 +324,10 @@ struct irq_domain *acpi_irq_create_hierarchy(unsigned int flags, #ifdef CONFIG_X86_IO_APIC extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity); #else -#define acpi_get_override_irq(gsi, trigger, polarity) (-1) +static inline int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity) +{ + return -1; +} #endif /* * This function undoes the effect of one call to acpi_register_gsi(). |