Commit 7197325b authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo
Browse files

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: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4f3dfdfb

drivers/net/wireless/mwifiex/main.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/mwifiex/main.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE