| Message ID | 20250407183656.1503446-1-superm1@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,1/2] ACPI: Add missing prototype for non CONFIG_SUSPEND/CONFIG_X86 case | expand |
On Mon, Apr 7, 2025 at 9:02 PM Mario Limonciello <superm1@kernel.org> wrote: > > From: Mario Limonciello <mario.limonciello@amd.com> > > acpi_register_lps0_dev() and acpi_unregister_lps0_dev() may be used > in drivers that don't require CONFIG_SUSPEND or compile on !X86. > > Add prototypes for those cases. > > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202502191627.fRgoBwcZ-lkp@intel.com/ > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > --- > v3: > * Add struct acpi_s2idle_dev_ops outside defines too > --- > include/linux/acpi.h | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 3f2e93ed97301..fc372bbaa5476 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1125,13 +1125,13 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state, > > acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, > u32 val_a, u32 val_b); > -#if defined(CONFIG_SUSPEND) && defined(CONFIG_X86) > struct acpi_s2idle_dev_ops { > struct list_head list_node; > void (*prepare)(void); > void (*check)(void); > void (*restore)(void); > }; > +#if defined(CONFIG_SUSPEND) && defined(CONFIG_X86) > int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg); > void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg); > int acpi_get_lps0_constraint(struct acpi_device *adev); > @@ -1140,6 +1140,13 @@ static inline int acpi_get_lps0_constraint(struct device *dev) > { > return ACPI_STATE_UNKNOWN; > } > +static inline int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg) > +{ > + return -ENODEV; > +} > +static inline void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg) > +{ > +} > #endif /* CONFIG_SUSPEND && CONFIG_X86 */ > void arch_reserve_mem_area(acpi_physical_address addr, size_t size); > #else > -- Applied along with the [2/2] as 6.16 material, thanks!
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 3f2e93ed97301..fc372bbaa5476 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1125,13 +1125,13 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state, acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b); -#if defined(CONFIG_SUSPEND) && defined(CONFIG_X86) struct acpi_s2idle_dev_ops { struct list_head list_node; void (*prepare)(void); void (*check)(void); void (*restore)(void); }; +#if defined(CONFIG_SUSPEND) && defined(CONFIG_X86) int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg); void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg); int acpi_get_lps0_constraint(struct acpi_device *adev); @@ -1140,6 +1140,13 @@ static inline int acpi_get_lps0_constraint(struct device *dev) { return ACPI_STATE_UNKNOWN; } +static inline int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg) +{ + return -ENODEV; +} +static inline void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg) +{ +} #endif /* CONFIG_SUSPEND && CONFIG_X86 */ void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else