mwifiex: get rid of extra num_cmd_timeout variable

We already have one in mwifiex_adapter structure.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 83195d96e78c..686943c52d18 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -892,7 +892,6 @@ mwifiex_cmd_timeout_func(unsigned long function_context)
         struct timeval tstamp;
 
         adapter->num_cmd_timeout++;
-        adapter->dbg.num_cmd_timeout++;
         if (!adapter->curr_cmd) {
                 dev_dbg(adapter->dev, "cmd: empty curr_cmd\n");
                 return;
@@ -916,7 +915,7 @@ mwifiex_cmd_timeout_func(unsigned long function_context)
                         adapter->dbg.num_cmd_host_to_card_failure);
 
                 dev_err(adapter->dev, "num_cmd_timeout = %d\n",
-                        adapter->dbg.num_cmd_timeout);
+                        adapter->num_cmd_timeout);
                 dev_err(adapter->dev, "num_tx_timeout = %d\n",
                         adapter->dbg.num_tx_timeout);
 
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index e9d64fc7d786..df09ddb64eec 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -145,7 +145,6 @@ struct mwifiex_dbg {
         u32 num_cmd_assoc_success;
         u32 num_cmd_assoc_failure;
         u32 num_tx_timeout;
-        u32 num_cmd_timeout;
         u16 timeout_cmd_id;
         u16 timeout_cmd_act;
         u16 last_cmd_id[DBG_CMD_NUM];
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 098de8810729..7022c69f0a29 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -104,6 +104,7 @@ int mwifiex_get_debug_info(struct mwifiex_private *priv,
                 info->pm_wakeup_fw_try = adapter->pm_wakeup_fw_try;
                 info->is_hs_configured = adapter->is_hs_configured;
                 info->hs_activated = adapter->hs_activated;
+                info->num_cmd_timeout = adapter->num_cmd_timeout;
                 info->num_cmd_host_to_card_failure
                                 = adapter->dbg.num_cmd_host_to_card_failure;
                 info->num_cmd_sleep_cfm_host_to_card_failure
@@ -119,7 +120,6 @@ int mwifiex_get_debug_info(struct mwifiex_private *priv,
                 info->num_cmd_assoc_failure =
                                         adapter->dbg.num_cmd_assoc_failure;
                 info->num_tx_timeout = adapter->dbg.num_tx_timeout;
-                info->num_cmd_timeout = adapter->dbg.num_cmd_timeout;
                 info->timeout_cmd_id = adapter->dbg.timeout_cmd_id;
                 info->timeout_cmd_act = adapter->dbg.timeout_cmd_act;
                 memcpy(info->last_cmd_id, adapter->dbg.last_cmd_id,