| Message ID | 20211026171313.50-1-mario.limonciello@amd.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v4,1/2] ACPI: Add stubs for wakeup handler functions | expand |
On Tue, Oct 26, 2021 at 7:13 PM Mario Limonciello <mario.limonciello@amd.com> wrote: > The commit ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") > added new functions for drivers to use during the s2idle wakeup path, but > didn't add stubs for when CONFIG_ACPI wasn't set. > > Add those stubs in for other drivers to be able to use. > > Fixes: ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> I need an ACK from an ACPI maintainer to take this with the other fix into the pinctrl tree. Alternatively both can be merged into the ACPI tree. Should these two patches be tagged for stable? Yours, Linus Walleij
[Public] > On Tue, Oct 26, 2021 at 7:13 PM Mario Limonciello > <mario.limonciello@amd.com> wrote: > > > The commit ddfd9dcf270c ("ACPI: PM: Add > acpi_[un]register_wakeup_handler()") > > added new functions for drivers to use during the s2idle wakeup path, but > > didn't add stubs for when CONFIG_ACPI wasn't set. > > > > Add those stubs in for other drivers to be able to use. > > > > Fixes: ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > > I need an ACK from an ACPI maintainer to take this with the > other fix into the pinctrl tree. > > Alternatively both can be merged into the ACPI tree. > > Should these two patches be tagged for stable? > Yes; I think they should be tagged to stable, but only if these come too: acd47b9f28e55b505aedb842131b40904e151d7c 7e6f8d6f4a42ef9b693ff1b49267c546931d4619
On Wed, Oct 27, 2021 at 12:11 AM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, Oct 26, 2021 at 7:13 PM Mario Limonciello > <mario.limonciello@amd.com> wrote: > > > The commit ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") > > added new functions for drivers to use during the s2idle wakeup path, but > > didn't add stubs for when CONFIG_ACPI wasn't set. > > > > Add those stubs in for other drivers to be able to use. > > > > Fixes: ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > > I need an ACK from an ACPI maintainer to take this with the > other fix into the pinctrl tree. There you are: Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 72e4f7fd268c..e29b4c1da377 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -976,6 +976,15 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) return -ENODEV; } +static inline int acpi_register_wakeup_handler(int wake_irq, + bool (*wakeup)(void *context), void *context) +{ + return -ENXIO; +} + +static inline void acpi_unregister_wakeup_handler( + bool (*wakeup)(void *context), void *context) { } + #endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
The commit ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") added new functions for drivers to use during the s2idle wakeup path, but didn't add stubs for when CONFIG_ACPI wasn't set. Add those stubs in for other drivers to be able to use. Fixes: ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()") Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- Changes from v3->v4: * Reword commit message * Adjust whitespace * Return -ENXIO instead of -EINVAL include/linux/acpi.h | 9 +++++++++ 1 file changed, 9 insertions(+)