---

yaml --- r: 219943 b: refs/heads/master c: 89b32d4 h: refs/heads/master i: 219941: d1e5e29 219939: cd6a59a 219935: e001135 v: v3
git-mirror · Sep 21, 2010 · 4646ff1 · 4646ff1
1 parent 07396c9
commit 4646ff1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c093865aecc7addd34a56b5cf4b2ee9223d9b2d
+refs/heads/master: 89b32d45fe88884d4780057dd18a098b402e358c
diff --git a/trunk/drivers/staging/winbond/core.h b/trunk/drivers/staging/winbond/core.h
@@ -1,7 +1,6 @@
 #ifndef __WINBOND_CORE_H
 #define __WINBOND_CORE_H
 
-#include <linux/spinlock.h>
 #include <linux/wireless.h>
 #include <linux/types.h>
 
@@ -21,8 +20,6 @@ struct mlme_frame {
 	u8		DataType;
 	u8		IsInUsed;
 
-	spinlock_t	MLMESpinLock;
-
 	u8		TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];
 	u8		TxMMPDUInUse[(MAX_NUM_TX_MMPDU + 3) & ~0x03];
 
@@ -57,8 +54,6 @@ struct wbsoft_priv {
 	struct hw_data sHwData;	/*For HAL */
 	struct wb35_mds Mds;
 
-	spinlock_t SpinLock;
-
 	atomic_t ThreadCount;
 
 	u32 RxByteCount;

diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
@@ -783,8 +783,6 @@ static int wb35_probe(struct usb_interface *intf,
 
 	priv = dev->priv;
 
-	spin_lock_init(&priv->SpinLock);
-
 	pWbUsb = &priv->sHwData.WbUsb;
 	pWbUsb->udev = udev;