From: Kalle Valo <kvalo@kernel.org>
To: Max Kellermann <max.kellermann@ionos.com>
Cc: miriam.rachel.korenblit@intel.com,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
ayala.barazani@intel.com
Subject: Re: [PATCH] iwlwifi/uefi: remove CONFIG_ACPI check
Date: Mon, 12 Feb 2024 09:14:23 +0200 [thread overview]
Message-ID: <87r0hif92o.fsf@kernel.org> (raw)
In-Reply-To: <20240211201919.3751551-1-max.kellermann@ionos.com> (Max Kellermann's message of "Sun, 11 Feb 2024 21:19:19 +0100")
Max Kellermann <max.kellermann@ionos.com> writes:
> This fixes a build failure on ARCH=arm when CONFIG_EFI is set but
> CONFIG_ACPI is not, because uefi.h declares iwl_uefi_get_sgom_table()
> and iwl_uefi_get_uats_table() as dummy inline function, but uefi.c
> contains the real (non-inline) implementation:
>
> drivers/net/wireless/intel/iwlwifi/fw/uefi.c:359:6: error: redefinition of 'iwl_uefi_get_sgom_table'
> 359 | void iwl_uefi_get_sgom_table(struct iwl_trans *trans,
> | ^~~~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/net/wireless/intel/iwlwifi/fw/uefi.c:11:
> drivers/net/wireless/intel/iwlwifi/fw/uefi.h:294:6: note: previous
> definition of 'iwl_uefi_get_sgom_table' with type 'void(struct
> iwl_trans *, struct iwl_fw_runtime *)'
> 294 | void iwl_uefi_get_sgom_table(struct iwl_trans *trans, struct iwl_fw_runtime *fwrt)
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/net/wireless/intel/iwlwifi/fw/uefi.c:392:5: error: redefinition of 'iwl_uefi_get_uats_table'
> 392 | int iwl_uefi_get_uats_table(struct iwl_trans *trans,
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/net/wireless/intel/iwlwifi/fw/uefi.h:299:5: note: previous
> definition of 'iwl_uefi_get_uats_table' with type 'int(struct
> iwl_trans *, struct iwl_fw_runtime *)'
> 299 | int iwl_uefi_get_uats_table(struct iwl_trans *trans,
> | ^~~~~~~~~~~~~~~~~~~~~~~
>
> 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@ionos.com>
> ---
> drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
"wifi:" missing from title but I'm guessing Johannes can add that.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2024-02-12 7:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-11 20:19 [PATCH] iwlwifi/uefi: remove CONFIG_ACPI check Max Kellermann
2024-02-12 7:14 ` Kalle Valo [this message]
2024-02-12 11:31 ` Korenblit, Miriam Rachel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r0hif92o.fsf@kernel.org \
--to=kvalo@kernel.org \
--cc=ayala.barazani@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=max.kellermann@ionos.com \
--cc=miriam.rachel.korenblit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox