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: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 2ada202c72ec457a6664ba7503f5919d4b5bcaeb..2bff87bd76a65b023845ec401f5348ae8a55167d 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -439,7 +439,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
        struct mwifiex_private *priv;
        s32 i, j;
 
-       spin_lock_init(&adapter->mwifiex_lock);
        spin_lock_init(&adapter->int_lock);
        spin_lock_init(&adapter->main_proc_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_lock(&adapter->mwifiex_lock);
-
        mwifiex_adapter_cleanup(adapter);
 
-       spin_unlock(&adapter->mwifiex_lock);
        adapter->hw_status = MWIFIEX_HW_STATUS_NOT_READY;
 }
 

diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index 6e76b302739b3eeea13eed325640edbdaa8d1d83..c1d96c64af7460f29ac8f054965917c7bcdc79f9 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -870,8 +870,6 @@ struct mwifiex_adapter {
        bool rx_locked;
        bool main_locked;
        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 */
        spinlock_t main_proc_lock;
        u32 mwifiex_processing;