From: Pekka Enberg <penberg@kernel.org>
To: gregkh@suse.de
Cc: linux-kernel@vger.kernel.org, Pekka Enberg <penberg@kernel.org>,
Pavel Machek <pavel@ucw.cz>
Subject: [PATCH 12/13] w35und: Remove unused fields from struct wb_usb
Date: Sun, 28 Nov 2010 23:00:07 +0200 [thread overview]
Message-ID: <1290978008-29095-12-git-send-email-penberg@kernel.org> (raw)
In-Reply-To: <1290978008-29095-1-git-send-email-penberg@kernel.org>
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>
---
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
next prev parent reply other threads:[~2010-11-28 21:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-28 20:59 [PATCH 01/13] w35und: Remove unused defines from sysdef.h Pekka Enberg
2010-11-28 20:59 ` [PATCH 02/13] w35und: Kill _USE_FALLBACK_RATE_ macro Pekka Enberg
2010-11-28 20:59 ` [PATCH 03/13] w35und: Kill WPA2 definitions Pekka Enberg
2010-11-28 20:59 ` [PATCH 04/13] w35und: Kill unused code in mac_structures.h Pekka Enberg
2010-11-28 21:00 ` [PATCH 05/13] w35und: Use pr_debug() for debugging Pekka Enberg
2010-11-28 21:00 ` [PATCH 06/13] w35und: Remove empty sysdef.h header Pekka Enberg
2010-11-28 21:00 ` [PATCH 07/13] w35und: Kill Vendor2 ifdef from hal_init_hardware Pekka Enberg
2010-11-28 21:00 ` [PATCH 08/13] w35und: Kill write-only ->TxToggle Pekka Enberg
2010-11-28 21:00 ` [PATCH 09/13] w35und: Kill _IBSS_BEACON_SEQ_STICK_ Pekka Enberg
2010-11-28 21:00 ` [PATCH 10/13] w35und: Merge mlmetxrx.c to mds.c Pekka Enberg
2010-11-28 21:00 ` [PATCH 11/13] w35und: Kill wblinux_f.h header Pekka Enberg
2010-11-28 21:00 ` Pekka Enberg [this message]
2010-11-28 21:00 ` [PATCH 13/13] w35und: Kill struct wb_usb Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290978008-29095-12-git-send-email-penberg@kernel.org \
--to=penberg@kernel.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome