summaryrefslogtreecommitdiff
path: root/drivers/staging/winbond
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2010-11-28 23:00:07 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-01 14:45:47 -0800
commit9be98819d31c4e105ad028ee092d27a46a9e298a (patch)
tree45819ee03a23c871d00edb416dc5fb56fafb729d /drivers/staging/winbond
parent4398954e5f91e340f5a2db53d219b6562e3e1bf0 (diff)
Staging: w35und: Remove unused fields from struct wb_usb
This patch removes two unused fields from struct wb_usb: - DetectCount which is always zero - IsUsb20 which is a write-only struct member Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond')
-rw-r--r--drivers/staging/winbond/wb35reg_s.h1
-rw-r--r--drivers/staging/winbond/wbusb.c8
-rw-r--r--drivers/staging/winbond/wbusb_s.h2
3 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/winbond/wb35reg_s.h b/drivers/staging/winbond/wb35reg_s.h
index 9b782ededf43..eb274ffdd1ba 100644
--- a/drivers/staging/winbond/wb35reg_s.h
+++ b/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/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 4f959c203857..3f5baa7eac26 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/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/drivers/staging/winbond/wbusb_s.h b/drivers/staging/winbond/wbusb_s.h
index 8961ae594c4e..f62639176a4f 100644
--- a/drivers/staging/winbond/wbusb_s.h
+++ b/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