Merge tag 'wireless-drivers-next-2020-03-27' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / net / wireless / intel / iwlwifi / fw / dbg.c

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 1746a0c..14ac715 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 - 2019 Intel Corporation
+ * Copyright(c) 2018 - 2020 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 - 2019 Intel Corporation
+ * Copyright(c) 2018 - 2020 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1441,11 +1441,7 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,
                goto out;
        }
 
-       /*
-        * region register have absolute value so apply rxf offset after
-        * reading the registers
-        */
-       offs += rxf_data.offset;
+       offs = rxf_data.offset;
 
        /* Lock fence */
        iwl_write_prph_no_grab(fwrt->trans, RXF_SET_FENCE_MODE + offs, 0x1);
@@ -2525,10 +2521,7 @@ static void iwl_fw_dbg_collect_sync(struct iwl_fw_runtime *fwrt, u8 wk_idx)
                goto out;
        }
 
-       if (iwl_fw_dbg_stop_restart_recording(fwrt, &params, true)) {
-               IWL_ERR(fwrt, "Failed to stop DBGC recording, aborting dump\n");
-               goto out;
-       }
+       iwl_fw_dbg_stop_restart_recording(fwrt, &params, true);
 
        IWL_DEBUG_FW_INFO(fwrt, "WRT: Data collection start\n");
        if (iwl_trans_dbg_ini_valid(fwrt->trans))
@@ -2693,14 +2686,14 @@ static int iwl_fw_dbg_restart_recording(struct iwl_trans *trans,
        return 0;
 }
 
-int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,
-                                     struct iwl_fw_dbg_params *params,
-                                     bool stop)
+void iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,
+                                      struct iwl_fw_dbg_params *params,
+                                      bool stop)
 {
        int ret = 0;
 
        if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status))
-               return 0;
+               return;
 
        if (fw_has_capa(&fwrt->fw->ucode_capa,
                        IWL_UCODE_TLV_CAPA_DBG_SUSPEND_RESUME_CMD_SUPP))
@@ -2717,7 +2710,5 @@ int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,
                        iwl_fw_set_dbg_rec_on(fwrt);
        }
 #endif
-
-       return ret;
 }
 IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_restart_recording);