>
> I don't know how the driver works, and I do not know why the CONFIG_ACPI
> check was added in the first place by commit c593d2fae592a
> ("iwlwifi: support SAR GEO Offset Mapping override via BIOS"), but since it did
> not add the same #ifdef to uefi.c, my first guess is that this piece of code shall
> be used even if ACPI is disabled.
>
> Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx>
> ---
> drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
> b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
> index 39053290bd59..8617fe8b65cd 100644
> --- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
> +++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
> @@ -285,7 +285,7 @@ static inline int iwl_uefi_get_dsm(struct iwl_fw_runtime
> *fwrt, } #endif /* CONFIG_EFI */
>
> -#if defined(CONFIG_EFI) && defined(CONFIG_ACPI)
> +#if defined(CONFIG_EFI)
> void iwl_uefi_get_sgom_table(struct iwl_trans *trans, struct iwl_fw_runtime
> *fwrt); int iwl_uefi_get_uats_table(struct iwl_trans *trans,
> struct iwl_fw_runtime *fwrt);
> --
Hi Max,
Thanks for your fix!
I think that I'd prefer Arnd Bergmans fix, looks cleaner to me.
Thanks!
> 2.39.2
