diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-01-04 15:37:09 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-01-04 15:37:09 +0100 |
| commit | 8e0feb25172b51978b9240aea1f0628c5b45b5b1 (patch) | |
| tree | 5db593acdbf2a10ae5ac861b2f002b71de3b8ce7 /include/acpi | |
| parent | 9f6875660c412cd8338ea7a66081cf35f812697a (diff) | |
| parent | 0890186a965868fa464582d5610c74eeff252c93 (diff) | |
| download | linux-stable-8e0feb25172b51978b9240aea1f0628c5b45b5b1.tar.gz linux-stable-8e0feb25172b51978b9240aea1f0628c5b45b5b1.tar.bz2 linux-stable-8e0feb25172b51978b9240aea1f0628c5b45b5b1.zip | |
Merge branch 'acpi-scan' into acpi-x86
Merge recent device enumeration changes to satisfy dependencies.
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index d6fe27b695c3..80c425bc98a7 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -505,6 +505,7 @@ extern int unregister_acpi_notifier(struct notifier_block *); */ int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device); +struct acpi_device *acpi_fetch_acpi_dev(acpi_handle handle); acpi_status acpi_bus_get_status_handle(acpi_handle handle, unsigned long long *sta); int acpi_bus_get_status(struct acpi_device *device); @@ -622,6 +623,22 @@ static inline bool acpi_device_override_status(struct acpi_device *adev, } #endif +#if IS_ENABLED(CONFIG_X86_ANDROID_TABLETS) +bool acpi_quirk_skip_i2c_client_enumeration(struct acpi_device *adev); +int acpi_quirk_skip_serdev_enumeration(struct device *controller_parent, bool *skip); +#else +static inline bool acpi_quirk_skip_i2c_client_enumeration(struct acpi_device *adev) +{ + return false; +} +static inline int +acpi_quirk_skip_serdev_enumeration(struct device *controller_parent, bool *skip) +{ + *skip = false; + return 0; +} +#endif + #ifdef CONFIG_PM void acpi_pm_wakeup_event(struct device *dev); acpi_status acpi_add_pm_notifier(struct acpi_device *adev, struct device *dev, |