diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-19 19:13:44 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2026-03-19 19:13:44 +0300 |
| commit | a56a658f2492ae70ca5e9db980b0af3aceb7b5b8 (patch) | |
| tree | 346e0638e1a4bd18d4d91051aeb169461c08148a /include | |
| parent | e7648ffecb7fcb7400e123bb6ea989633a104fc3 (diff) | |
| parent | 236ad358166cca167e6ed33639bb7948e7a2f6fd (diff) | |
| download | linux-a56a658f2492ae70ca5e9db980b0af3aceb7b5b8.tar.xz | |
Merge back updates of core ACPI drivers for 7.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 5 | ||||
| -rw-r--r-- | include/acpi/processor.h | 2 | ||||
| -rw-r--r-- | include/linux/auxiliary_bus.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index aad1a95e6863..f7c2d3daed44 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -613,6 +613,8 @@ struct acpi_bus_event { u32 data; }; +#define ACPI_AC_CLASS "ac_adapter" + extern struct kobject *acpi_kobj; extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); void acpi_bus_private_data_handler(acpi_handle, void *); @@ -625,7 +627,8 @@ int acpi_dev_install_notify_handler(struct acpi_device *adev, void acpi_dev_remove_notify_handler(struct acpi_device *adev, u32 handler_type, acpi_notify_handler handler); -extern int acpi_notifier_call_chain(struct acpi_device *, u32, u32); +extern int acpi_notifier_call_chain(const char *device_class, + const char *bus_id, u32 type, u32 data); extern int register_acpi_notifier(struct notifier_block *); extern int unregister_acpi_notifier(struct notifier_block *); diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 7146a8e9e9c2..554be224ce76 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -14,8 +14,6 @@ #include <asm/acpi.h> -#define ACPI_PROCESSOR_CLASS "processor" -#define ACPI_PROCESSOR_DEVICE_NAME "Processor" #define ACPI_PROCESSOR_DEVICE_HID "ACPI0007" #define ACPI_PROCESSOR_CONTAINER_HID "ACPI0010" diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h index 4086afd0cc6b..bc09b55e3682 100644 --- a/include/linux/auxiliary_bus.h +++ b/include/linux/auxiliary_bus.h @@ -271,6 +271,8 @@ struct auxiliary_device *__devm_auxiliary_device_create(struct device *dev, __devm_auxiliary_device_create(dev, KBUILD_MODNAME, devname, \ platform_data, 0) +bool dev_is_auxiliary(struct device *dev); + /** * module_auxiliary_driver() - Helper macro for registering an auxiliary driver * @__auxiliary_driver: auxiliary driver struct |