diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2014-12-31 02:36:38 -0800 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-06 21:19:22 +0200 |
| commit | 7197325b17737144e2e7cb9f68d2ebd1a0696ee1 (patch) | |
| tree | 73ad0339b8aa67c111645e57312e63ee1560d574 /drivers | |
| parent | 4f3dfdfb4cbf1771f2e0e17d0dcb2cd1852fd392 (diff) | |
| download | linux-7197325b17737144e2e7cb9f68d2ebd1a0696ee1.tar.bz2 | |
mwifiex: remove redundant flag MWIFIEX_HW_STATUS_FW_READY
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 6125d1c8ae3a..2568395f0276 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -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; diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index dd55bc16aeab..f9279399226a 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h @@ -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, |