]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iwlwifi: dvm: don't use IWL_DL_FW_ERRORS
authorSara Sharon <sara.sharon@intel.com>
Mon, 17 Dec 2018 09:38:03 +0000 (11:38 +0200)
committerLuca Coelho <luciano.coelho@intel.com>
Thu, 14 Feb 2019 09:29:42 +0000 (11:29 +0200)
Use IWL_DL_FW instead. This will free a bit for more
needed prints in newer devices.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/dvm/main.c

index bd3c3b921d4cc551225b0fd2e3e5b2bb8d447c98..114f0ab022a7c8be01f28b7da543c89ede7c848a 100644 (file)
@@ -1881,7 +1881,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                return pos;
        }
 
-       if (!(iwl_have_debug_level(IWL_DL_FW_ERRORS)) && !full_log)
+       if (!(iwl_have_debug_level(IWL_DL_FW)) && !full_log)
                size = (size > DEFAULT_DUMP_EVENT_LOG_ENTRIES)
                        ? DEFAULT_DUMP_EVENT_LOG_ENTRIES : size;
        IWL_ERR(priv, "Start IWL Event Log Dump: display last %u entries\n",
@@ -1897,7 +1897,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                if (!*buf)
                        return -ENOMEM;
        }
-       if (iwl_have_debug_level(IWL_DL_FW_ERRORS) || full_log) {
+       if (iwl_have_debug_level(IWL_DL_FW) || full_log) {
                /*
                 * if uCode has wrapped back to top of log,
                 * start at the oldest entry,
@@ -1927,7 +1927,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
        unsigned int reload_msec;
        unsigned long reload_jiffies;
 
-       if (iwl_have_debug_level(IWL_DL_FW_ERRORS))
+       if (iwl_have_debug_level(IWL_DL_FW))
                iwl_print_rx_config_cmd(priv, IWL_RXON_CTX_BSS);
 
        /* uCode is no longer loaded. */
@@ -1965,12 +1965,12 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
 
        if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
                if (iwlwifi_mod_params.fw_restart) {
-                       IWL_DEBUG_FW_ERRORS(priv,
-                                 "Restarting adapter due to uCode error.\n");
+                       IWL_DEBUG_FW(priv,
+                                    "Restarting adapter due to uCode error.\n");
                        queue_work(priv->workqueue, &priv->restart);
                } else
-                       IWL_DEBUG_FW_ERRORS(priv,
-                                 "Detected FW error, but not restarting\n");
+                       IWL_DEBUG_FW(priv,
+                                    "Detected FW error, but not restarting\n");
        }
 }