Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc69ca39 authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

mwifiex: remove useless 'mwifiex_lock' 



If mwifiex_shutdown_drv() is racing with another mwifiex_shutdown_drv(),
we *really* have problems. Kill the lock.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6eb2d002

drivers/net/wireless/marvell/mwifiex/init.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -439,7 +439,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter) 
	struct mwifiex_private *priv;

	struct mwifiex_private *priv;

	s32 i, j;

	s32 i, j;





	spin_lock_init(&adapter->mwifiex_lock);

	spin_lock_init(&adapter->int_lock);

	spin_lock_init(&adapter->int_lock);

	spin_lock_init(&adapter->main_proc_lock);

	spin_lock_init(&adapter->main_proc_lock);

	spin_lock_init(&adapter->mwifiex_cmd_lock);

	spin_lock_init(&adapter->mwifiex_cmd_lock);
@@ -693,11 +692,8 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) 




	spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);

	spin_unlock_irqrestore(&adapter->rx_proc_lock, flags);





	spin_lock(&adapter->mwifiex_lock);



	mwifiex_adapter_cleanup(adapter);

	mwifiex_adapter_cleanup(adapter);





	spin_unlock(&adapter->mwifiex_lock);

	adapter->hw_status = MWIFIEX_HW_STATUS_NOT_READY;

	adapter->hw_status = MWIFIEX_HW_STATUS_NOT_READY;

}

}

drivers/net/wireless/marvell/mwifiex/main.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -870,8 +870,6 @@ struct mwifiex_adapter { 
	bool rx_locked;

	bool rx_locked;

	bool main_locked;

	bool main_locked;

	struct mwifiex_bss_prio_tbl bss_prio_tbl[MWIFIEX_MAX_BSS_NUM];

	struct mwifiex_bss_prio_tbl bss_prio_tbl[MWIFIEX_MAX_BSS_NUM];

	/* spin lock for init/shutdown */

	spinlock_t mwifiex_lock;

	/* spin lock for main process */

	/* spin lock for main process */

	spinlock_t main_proc_lock;

	spinlock_t main_proc_lock;

	u32 mwifiex_processing;

	u32 mwifiex_processing;