From: Emmanuel Grumbach This function reaches the transport eventually so move it to iwl-trans.c. Now we can remove the include to the pcie transport's internal header from iwl-io.c Signed-off-by: Emmanuel Grumbach Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/iwl-io.c | 7 ------- drivers/net/wireless/intel/iwlwifi/iwl-io.h | 2 -- drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 9 ++++++++- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 ++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c index c4ccfffdf6af..bb746112ddad 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c @@ -12,7 +12,6 @@ #include "iwl-debug.h" #include "iwl-prph.h" #include "iwl-fh.h" -#include "pcie/gen1_2/internal.h" void iwl_write8(struct iwl_trans *trans, u32 ofs, u8 val) { @@ -412,12 +411,6 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf) return 0; } -int iwl_trans_activate_nic(struct iwl_trans *trans) -{ - return iwl_pcie_gen1_2_activate_nic(trans); -} -IWL_EXPORT_SYMBOL(iwl_trans_activate_nic); - void iwl_trans_sync_nmi_with_addr(struct iwl_trans *trans, u32 inta_addr, u32 sw_err_bit) { diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h index d920a32fc173..6dce2e5267a6 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.h @@ -59,8 +59,6 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs, void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask); void iwl_force_nmi(struct iwl_trans *trans); -int iwl_trans_activate_nic(struct iwl_trans *trans); - /* Error handling */ int iwl_dump_fh(struct iwl_trans *trans, char **buf); diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c index db1db0a42928..5b44e15fe64d 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2019-2021, 2023-2025 Intel Corporation + * Copyright (C) 2019-2021, 2023-2026 Intel Corporation */ #include #include @@ -820,3 +820,10 @@ bool iwl_trans_is_ltr_enabled(struct iwl_trans *trans) return iwl_pcie_gen1_2_is_ltr_enabled(trans); } IWL_EXPORT_SYMBOL(iwl_trans_is_ltr_enabled); + +int iwl_trans_activate_nic(struct iwl_trans *trans) +{ + return iwl_pcie_gen1_2_activate_nic(trans); +} +IWL_EXPORT_SYMBOL(iwl_trans_activate_nic); + diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h index c661807c6e6b..1ed6bcb7882c 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h @@ -1053,6 +1053,8 @@ static inline bool iwl_trans_dbg_ini_valid(struct iwl_trans *trans) void iwl_trans_interrupts(struct iwl_trans *trans, bool enable); +int iwl_trans_activate_nic(struct iwl_trans *trans); + static inline void iwl_trans_finish_sw_reset(struct iwl_trans *trans) { clear_bit(STATUS_IN_SW_RESET, &trans->status); -- 2.34.1