From: Johannes Berg Date: Fri, 27 Dec 2024 08:01:12 +0000 (+0200) Subject: wifi: iwlwifi: iwl_fw_error_collect() is always called sync X-Git-Tag: v6.14-rc1~162^2~20^2~92 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f28cc081f0e49c7bf749828313b3c73cf13d6c1;p=thirdparty%2Fkernel%2Fstable.git wifi: iwlwifi: iwl_fw_error_collect() is always called sync Since iwl_fw_error_collect() is now always called with the sync argument set to true, to collect data synchronously, remove the argument from it entirely. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20241227095718.08f515513e88.I780a557743ca7f029f46a1cc75d0799542e39d83@changeid Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h index f4803b55adb91..87998374f459e 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.h @@ -287,7 +287,7 @@ static inline void iwl_fw_umac_set_alive_err_table(struct iwl_trans *trans, trans->dbg.umac_error_event_table = umac_error_event_table; } -static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt, bool sync) +static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt) { enum iwl_fw_ini_time_point tp_id; @@ -303,7 +303,7 @@ static inline void iwl_fw_error_collect(struct iwl_fw_runtime *fwrt, bool sync) tp_id = IWL_FW_INI_TIME_POINT_FW_ASSERT; } - _iwl_dbg_tlv_time_point(fwrt, tp_id, NULL, sync); + iwl_dbg_tlv_time_point_sync(fwrt, tp_id, NULL); } static inline void iwl_fwrt_update_fw_versions(struct iwl_fw_runtime *fwrt, diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index 08c59df593b24..7250c85fb6e6c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -2043,11 +2043,11 @@ static void iwl_mvm_dump_error(struct iwl_op_mode *op_mode, /* if we come in from opmode we have the mutex held */ if (mode->context == IWL_ERR_CONTEXT_FROM_OPMODE) { lockdep_assert_held(&mvm->mutex); - iwl_fw_error_collect(&mvm->fwrt, true); + iwl_fw_error_collect(&mvm->fwrt); } else { mutex_lock(&mvm->mutex); if (mode->context != IWL_ERR_CONTEXT_ABORT) - iwl_fw_error_collect(&mvm->fwrt, true); + iwl_fw_error_collect(&mvm->fwrt); mutex_unlock(&mvm->mutex); } }