Re: [PATCH v5 2/5] Drivers: hv: allow non ACPI compilation for hv_is_hibernation_supported

From: Rob Herring
Date: Thu Feb 09 2023 - 10:18:04 EST


On Thu, Feb 9, 2023 at 6:15 AM Saurabh Sengar
<ssengar@xxxxxxxxxxxxxxxxxxx> wrote:
>
> acpi_sleep_state_supported() currently is defined only when
> CONFIG_ACPI=y. For future work to enable device tree builds, put this
> function under #ifdef CONFIG_ACPI. Otherwise, return 'false' from
> hv_is_hibernation_supported() as Hyper-V guest configs using device
> tree don't support hibernation.
>
> Signed-off-by: Saurabh Sengar <ssengar@xxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Michael Kelley <mikelley@xxxxxxxxxxxxx>
> ---
> drivers/hv/hv_common.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/hv/hv_common.c b/drivers/hv/hv_common.c
> index 52a6f89ccdbd..370ec20d1993 100644
> --- a/drivers/hv/hv_common.c
> +++ b/drivers/hv/hv_common.c
> @@ -234,7 +234,11 @@ EXPORT_SYMBOL_GPL(hv_setup_dma_ops);
>
> bool hv_is_hibernation_supported(void)
> {
> +#ifdef CONFIG_ACPI
> return !hv_root_partition && acpi_sleep_state_supported(ACPI_STATE_S4);

Rework the acpi_bus.h header so that this is defined for !CONFIG_ACPI:

static inline bool acpi_sleep_state_supported(u8 sleep_state) { return false; }

Then you don't need this change here. That or using IS_ENABLED() is
strongly preferred over #ifdefs.

Rob