iwlwifi: fw: make dump_start callback void
authorJohannes Berg <johannes.berg@intel.com>
Sun, 30 Jan 2022 09:52:59 +0000 (11:52 +0200)
committerLuca Coelho <luciano.coelho@intel.com>
Fri, 18 Feb 2022 08:40:52 +0000 (10:40 +0200)
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>
drivers/net/wireless/intel/iwlwifi/fw/dbg.c
drivers/net/wireless/intel/iwlwifi/fw/runtime.h
drivers/net/wireless/intel/iwlwifi/mvm/ops.c

index 6e090f1..0a5d860 100644 (file)
@@ -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);
 
index 3cb0ddb..afc822c 100644 (file)
@@ -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);
index d3122a3..a4c1fdf 100644 (file)
@@ -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)