diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-04-26 18:03:22 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-04-26 18:03:22 +0300 |
| commit | ab497507c0e4df6282b9212c40cbc7acd5c55cdd (patch) | |
| tree | d361a0ec2c31378b4d7dc5defea20ba7b2c593fe /include | |
| parent | 25d95763269135b995a10f7ff9662aae66094258 (diff) | |
| parent | ebf1bef3612f6b49ad52c1312f41bd2161774bfc (diff) | |
| download | linux-ab497507c0e4df6282b9212c40cbc7acd5c55cdd.tar.xz | |
Merge branch 'acpi-messages'
* acpi-messages:
hwmon: acpi_power_meter: Get rid of ACPICA message printing
IIO: acpi-als: Get rid of ACPICA message printing
ACPI: utils: Introduce acpi_evaluation_failure_warn()
ACPI: Drop unused ACPI_*_COMPONENT definitions and update documentation
ACPI: sysfs: Get rid of ACPICA message printing
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 10 | ||||
| -rw-r--r-- | include/linux/acpi.h | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 97e9a066417d..8372b0e7fd15 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -12,16 +12,6 @@ #define ACPI_MAX_STRING 80 /* - * Please update drivers/acpi/debug.c and Documentation/firmware-guide/acpi/debug.rst - * if you add to this list. - */ -#define ACPI_SBS_COMPONENT 0x00100000 -#define ACPI_FAN_COMPONENT 0x00200000 -#define ACPI_CONTAINER_COMPONENT 0x01000000 -#define ACPI_SYSTEM_COMPONENT 0x02000000 -#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000 - -/* * _HID definitions * HIDs must conform to ACPI spec(6.1.4) * Linux specific HIDs do not apply to this and begin with LNX: diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3bdcfc4401b7..92f63b8a0180 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1034,9 +1034,14 @@ static inline void acpi_ec_set_gpe_wake_mask(u8 action) {} __printf(3, 4) void acpi_handle_printk(const char *level, acpi_handle handle, const char *fmt, ...); +void acpi_evaluation_failure_warn(acpi_handle handle, const char *name, + acpi_status status); #else /* !CONFIG_ACPI */ static inline __printf(3, 4) void acpi_handle_printk(const char *level, void *handle, const char *fmt, ...) {} +static inline void acpi_evaluation_failure_warn(acpi_handle handle, + const char *name, + acpi_status status) {} #endif /* !CONFIG_ACPI */ #if defined(CONFIG_ACPI) && defined(CONFIG_DYNAMIC_DEBUG) |