From a969d27110cefbaa4d1b2b5997a6ddfaed18ea41 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 28 Nov 2010 23:00:07 +0200
Subject: [PATCH] --- yaml --- r: 228237 b: refs/heads/master c:
 9be98819d31c4e105ad028ee092d27a46a9e298a h: refs/heads/master i:   228235:
 6ff169a7ac3834eeb7c62394fee47651323fe474 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/winbond/wb35reg_s.h | 1 -
 trunk/drivers/staging/winbond/wbusb.c     | 8 ++------
 trunk/drivers/staging/winbond/wbusb_s.h   | 2 --
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 90f68df35442..50ba591cb093 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4398954e5f91e340f5a2db53d219b6562e3e1bf0
+refs/heads/master: 9be98819d31c4e105ad028ee092d27a46a9e298a
diff --git a/trunk/drivers/staging/winbond/wb35reg_s.h b/trunk/drivers/staging/winbond/wb35reg_s.h
index 9b782ededf43..eb274ffdd1ba 100644
--- a/trunk/drivers/staging/winbond/wb35reg_s.h
+++ b/trunk/drivers/staging/winbond/wb35reg_s.h
@@ -234,7 +234,6 @@ u32 hal_get_bss_pk_cnt(struct hw_data *hw_data);
 
 /* return 100ms count */
 #define hal_get_time_count(_P)		(_P->time_count / 10)
-#define hal_detect_error(_P)		(_P->WbUsb.DetectCount)
 
 #define hal_ibss_disconnect(_A)		(hal_stop_sync_bss(_A))
 
diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
index 4f959c203857..3f5baa7eac26 100644
--- a/trunk/drivers/staging/winbond/wbusb.c
+++ b/trunk/drivers/staging/winbond/wbusb.c
@@ -337,10 +337,8 @@ static void hal_stop(struct hw_data *pHwData)
 static unsigned char hal_idle(struct hw_data *pHwData)
 {
 	struct wb35_reg *reg = &pHwData->reg;
-	struct wb_usb *pWbUsb = &pHwData->WbUsb;
 
-	if (!pHwData->SurpriseRemove
-	    && (pWbUsb->DetectCount || reg->EP0vm_state != VM_STOP))
+	if (!pHwData->SurpriseRemove && reg->EP0vm_state != VM_STOP)
 		return false;
 
 	return true;
@@ -786,10 +784,8 @@ static int wb35_probe(struct usb_interface *intf,
 	interface = intf->cur_altsetting;
 	endpoint = &interface->endpoint[0].desc;
 
-	if (endpoint[2].wMaxPacketSize == 512) {
+	if (endpoint[2].wMaxPacketSize == 512)
 		printk("[w35und] Working on USB 2.0\n");
-		pWbUsb->IsUsb20 = 1;
-	}
 
 	err = wb35_hw_init(dev);
 	if (err)
diff --git a/trunk/drivers/staging/winbond/wbusb_s.h b/trunk/drivers/staging/winbond/wbusb_s.h
index 8961ae594c4e..f62639176a4f 100644
--- a/trunk/drivers/staging/winbond/wbusb_s.h
+++ b/trunk/drivers/staging/winbond/wbusb_s.h
@@ -11,8 +11,6 @@
 #include <linux/types.h>
 
 struct wb_usb {
-	u32	IsUsb20;
 	struct	usb_device *udev;
-	u32	DetectCount;
 };
 #endif