iwlwifi: fw: make dump_start callback void

We never return errors there, so just make it void.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220130115024.375b3a28d89e.Ia76e9bf13e26eb148abfebdaf859eab1b81d2af1@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 6e090f10b8ebbabc39be1cc72fb036f6e6177775..0a5d860e489e43cdea72f74c53afbac1da29aa68 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2939,9 +2939,8 @@ void iwl_fw_error_dump_wk(struct work_struct *work)
        /* assumes the op mode mutex is locked in dump_start since
         * iwl_fw_dbg_collect_sync can't run in parallel
         */
-       if (fwrt->ops && fwrt->ops->dump_start &&
-           fwrt->ops->dump_start(fwrt->ops_ctx))
-               return;
+       if (fwrt->ops && fwrt->ops->dump_start)
+               fwrt->ops->dump_start(fwrt->ops_ctx);
 
        iwl_fw_dbg_collect_sync(fwrt, wks->idx);
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
index 3cb0ddbe3ab20aea5f3fe2203e52009fb3a7eae9..afc822cab6746ee35c9a8136de93f7019a026ecc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
@@ -16,7 +16,7 @@
 #include "fw/acpi.h"
 
 struct iwl_fw_runtime_ops {
-       int (*dump_start)(void *ctx);
+       void (*dump_start)(void *ctx);
        void (*dump_end)(void *ctx);
        bool (*fw_running)(void *ctx);
        int (*send_hcmd)(void *ctx, struct iwl_host_cmd *host_cmd);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index d3122a3870b9b5b4e6e1b78b911aa502b05e1563..a4c1fdf33b7694abca78cd76fa92470aea36955f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -639,13 +639,11 @@ unlock:
        mutex_unlock(&mvm->mutex);
 }
 
-static int iwl_mvm_fwrt_dump_start(void *ctx)
+static void iwl_mvm_fwrt_dump_start(void *ctx)
 {
        struct iwl_mvm *mvm = ctx;
 
        mutex_lock(&mvm->mutex);
-
-       return 0;
 }
 
 static void iwl_mvm_fwrt_dump_end(void *ctx)