linux-kernel - [PATCH 12/13] w35und: Remove unused fields from struct wb

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1290978008-29095-12-git-send-email-penberg@kernel.org>
Date:	Sun, 28 Nov 2010 23:00:07 +0200
From:	Pekka Enberg <penberg@...nel.org>
To:	gregkh@...e.de
Cc:	linux-kernel@...r.kernel.org, Pekka Enberg <penberg@...nel.org>,
	Pavel Machek <pavel@....cz>
Subject: [PATCH 12/13] 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@....cz>
Signed-off-by: Pekka Enberg <penberg@...nel.org>
---
 drivers/staging/winbond/wb35reg_s.h |    1 -
 drivers/staging/winbond/wbusb.c     |    8 ++------
 drivers/staging/winbond/wbusb_s.h   |    2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/winbond/wb35reg_s.h b/drivers/staging/winbond/wb35reg_s.h
index 9b782ed..eb274ff 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 4f959c2..3f5baa7 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 8961ae5..f626391 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
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/