diff mbox series

[v3,1/2] ACPI: Add stubs for wakeup handler functions

Message ID 20211019160401.8296-1-mario.limonciello@amd.com
State New
Headers show
Series [v3,1/2] ACPI: Add stubs for wakeup handler functions | expand

Commit Message

Mario Limonciello Oct. 19, 2021, 4:04 p.m. UTC
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>
---
 include/linux/acpi.h | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Basavaraj Natikar Oct. 22, 2021, 11:17 a.m. UTC | #1
On 10/19/2021 9:34 PM, Mario Limonciello wrote:
> 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>
> ---
>  include/linux/acpi.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 72e4f7fd268c..b31bcc0f4c89 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -976,6 +976,14 @@ 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 -EINVAL;
> +}

line break is missing.

Thanks,
Basavaraj

> +static inline void acpi_unregister_wakeup_handler(
> +	bool (*wakeup)(void *context), void *context) { }
> +
>  #endif	/* !CONFIG_ACPI */
>  
>  #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
Rafael J. Wysocki Oct. 22, 2021, 12:54 p.m. UTC | #2
CC: linux-acpi

On Tuesday, October 19, 2021 6:04:00 PM CEST Mario Limonciello wrote:
> 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>
> ---
>  include/linux/acpi.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 72e4f7fd268c..b31bcc0f4c89 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -976,6 +976,14 @@ 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 -EINVAL;

-ENOTSUPP ?

> +}
> +static inline void acpi_unregister_wakeup_handler(
> +	bool (*wakeup)(void *context), void *context) { }
> +
>  #endif	/* !CONFIG_ACPI */
>  
>  #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
>
Andy Shevchenko Oct. 22, 2021, 12:57 p.m. UTC | #3
On Tue, Oct 19, 2021 at 7:05 PM Mario Limonciello
<mario.limonciello@amd.com> wrote:

Thanks! My comments below.

> commit ddfd9dcf270c ("ACPI: PM: Add acpi_[un]register_wakeup_handler()")

The commit

> 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.

...

> +static inline int acpi_register_wakeup_handler(
> +       int wake_irq, bool (*wakeup)(void *context), void *context)

A bit of a strange indentation. Can wake_irq be on the previous line?
Mario Limonciello Oct. 22, 2021, 8:32 p.m. UTC | #4
[Public]



> -----Original Message-----
> From: Rafael J. Wysocki <rjw@rjwysocki.net>
> Sent: Friday, October 22, 2021 07:54
> To: Limonciello, Mario <Mario.Limonciello@amd.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>; Natikar, Basavaraj
> <Basavaraj.Natikar@amd.com>; S-k, Shyam-sundar <Shyam-sundar.S-
> k@amd.com>; open list:PIN CONTROL SUBSYSTEM <linux-
> gpio@vger.kernel.org>; open list <linux-kernel@vger.kernel.org>; Shah, Nehal-
> bakulchandra <Nehal-bakulchandra.Shah@amd.com>; Limonciello, Mario
> <Mario.Limonciello@amd.com>; Linux ACPI <linux-acpi@vger.kernel.org>
> Subject: Re: [PATCH v3 1/2] ACPI: Add stubs for wakeup handler functions
> 
> CC: linux-acpi
> 
> On Tuesday, October 19, 2021 6:04:00 PM CEST Mario Limonciello wrote:
> > 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>
> > ---
> >  include/linux/acpi.h | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> > index 72e4f7fd268c..b31bcc0f4c89 100644
> > --- a/include/linux/acpi.h
> > +++ b/include/linux/acpi.h
> > @@ -976,6 +976,14 @@ 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 -EINVAL;
> 
> -ENOTSUPP ?
> 

checkpatch reports:

WARNING: ENOTSUPP is not a SUSV4 error code, prefer EOPNOTSUPP

So what to use?

> > +}
> > +static inline void acpi_unregister_wakeup_handler(
> > +	bool (*wakeup)(void *context), void *context) { }
> > +
> >  #endif	/* !CONFIG_ACPI */
> >
> >  #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
> >
> 
> 
>
diff mbox series

Patch

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 72e4f7fd268c..b31bcc0f4c89 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -976,6 +976,14 @@  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 -EINVAL;
+}
+static inline void acpi_unregister_wakeup_handler(
+	bool (*wakeup)(void *context), void *context) { }
+
 #endif	/* !CONFIG_ACPI */
 
 #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC