mwifiex: remove redundant flag MWIFIEX_HW_STATUS_FW_READY
authorAmitkumar Karwar <akarwar@marvell.com>
Wed, 31 Dec 2014 10:36:38 +0000 (02:36 -0800)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 6 Jan 2015 19:19:22 +0000 (21:19 +0200)
This flag is never set but checked at two places. We will get rid of
this code.

Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/mwifiex/main.h

index 6125d1c8ae3a035cac3b2498177740c07c12dfa8..2568395f02760e92da0d963449620f8422c30a21 100644 (file)
@@ -511,8 +511,7 @@ err_dnld_fw:
        if (adapter->if_ops.unregister_dev)
                adapter->if_ops.unregister_dev(adapter);
 
-       if ((adapter->hw_status == MWIFIEX_HW_STATUS_FW_READY) ||
-           (adapter->hw_status == MWIFIEX_HW_STATUS_READY)) {
+       if (adapter->hw_status == MWIFIEX_HW_STATUS_READY) {
                pr_debug("info: %s: shutdown mwifiex\n", __func__);
                adapter->init_wait_q_woken = false;
 
@@ -1116,8 +1115,7 @@ err_init_fw:
        pr_debug("info: %s: unregister device\n", __func__);
        if (adapter->if_ops.unregister_dev)
                adapter->if_ops.unregister_dev(adapter);
-       if ((adapter->hw_status == MWIFIEX_HW_STATUS_FW_READY) ||
-           (adapter->hw_status == MWIFIEX_HW_STATUS_READY)) {
+       if (adapter->hw_status == MWIFIEX_HW_STATUS_READY) {
                pr_debug("info: %s: shutdown mwifiex\n", __func__);
                adapter->init_wait_q_woken = false;
 
index dd55bc16aeabf7790e6ded899f47fc67188a97cc..f9279399226a91b6da1256fc06b8d42d44a4edbb 100644 (file)
@@ -165,7 +165,6 @@ struct mwifiex_dbg {
 enum MWIFIEX_HARDWARE_STATUS {
        MWIFIEX_HW_STATUS_READY,
        MWIFIEX_HW_STATUS_INITIALIZING,
-       MWIFIEX_HW_STATUS_FW_READY,
        MWIFIEX_HW_STATUS_INIT_DONE,
        MWIFIEX_HW_STATUS_RESET,
        MWIFIEX_HW_STATUS_CLOSING,