1. 12 Feb, 2024 1 commit
    • Arnd Bergmann's avatar
      wifi: iwlwifi: fix #ifdef CONFIG_ACPI check · bad9d211
      Arnd Bergmann authored
      The #ifdef check around the function definition for two functions was
      changed without also changing the one on the declaration:
      
      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,
            |     ^~~~~~~~~~~~~~~~~~~~~~~
      
      Adapt it by merging the declarations into the existing #ifdef block.
      
      Fixes: 74f4cd71 ("wifi: iwlwifi: take SGOM and UATS code out of ACPI ifdef")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Link: https://msgid.link/20240212112343.1148931-1-arnd@kernel.orgSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      bad9d211
  2. 09 Feb, 2024 1 commit
  3. 08 Feb, 2024 38 commits