staging: vt6656: lock changes: Remove spin locks.

Remove atomic paths to usbpipe.c PIPEnsControlOut and PIPEnsControlIn

Remove from
PIPEnsControlOut
PIPEnsControlIn
BSSvSecondCallBack
vt6656_hostap_ioctl
iwctl_siwmode
iwctl_siwencode
iwctl_siwpower
iwctl_siwencodeext
KeyvInitTable
device_init_registers
device_open
device_close

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index 9c78dab..b018955 100644 (file)
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -818,8 +818,6 @@ void BSSvSecondCallBack(struct work_struct *work)
        if (pDevice->Flags & fMP_DISCONNECTED)
                return;
 
-       spin_lock_irq(&pDevice->lock);
-
        pDevice->uAssocCount = 0;
 
        /* Power Saving Mode Tx Burst */
@@ -1158,8 +1156,6 @@ void BSSvSecondCallBack(struct work_struct *work)
                        netif_wake_queue(pDevice->dev);
        }
 
-       spin_unlock_irq(&pDevice->lock);
-
        schedule_delayed_work(&pDevice->second_callback_work, HZ);
 }
 

diff --cc drivers/staging/vt6656/firmware.c
Simple merge

diff --cc drivers/staging/vt6656/hostap.c
Simple merge

diff --cc drivers/staging/vt6656/iwctl.c
Simple merge

diff --cc drivers/staging/vt6656/key.c
Simple merge

diff --cc drivers/staging/vt6656/main_usb.c
Simple merge

diff --cc drivers/staging/vt6656/usbpipe.c
Simple merge