mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Max Kellermann <max.kellermann@ionos.com>
To: miriam.rachel.korenblit@intel.com, kvalo@kernel.org,
	linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
	ayala.barazani@intel.com
Cc: Max Kellermann <max.kellermann@ionos.com>
Subject: [PATCH] iwlwifi/uefi: remove CONFIG_ACPI check
Date: Sun, 11 Feb 2024 21:19:19 +0100	[thread overview]
Message-ID: <20240211201919.3751551-1-max.kellermann@ionos.com> (raw)

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(-)

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);
-- 
2.39.2


             reply	other threads:[~2024-02-11 20:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-11 20:19 Max Kellermann [this message]
2024-02-12  7:14 ` Kalle Valo
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=20240211201919.3751551-1-max.kellermann@ionos.com \
    --to=max.kellermann@ionos.com \
    --cc=ayala.barazani@intel.com \
    --cc=kvalo@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®