From 633927ca29f3c87ff6f4a60a067cab19c3f58410 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Mon, 1 Nov 2010 22:29:28 +0200
Subject: [PATCH] --- yaml --- r: 228015 b: refs/heads/master c:
 6112063d804aa0afc8d4462b22e36fc259393b64 h: refs/heads/master i:   228013:
 32bc2ec59c99ab80177a78e17cabf9839da81b8e   228011:
 e441eec17b7c520053fa44ae513d35a973920272   228007:
 da764860b3aa6b87a7da8a84f82f83b61f4a2491   227999:
 c86ddd96d9275ab620991f2133d5cd703bb56c1b v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/winbond/mds.c   | 5 -----
 trunk/drivers/staging/winbond/mds_f.h | 1 -
 trunk/drivers/staging/winbond/wbusb.c | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b0cef680fa3a..36b357f4dcd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dd5f271441bbe85578c2b7841820d8bca26096c
+refs/heads/master: 6112063d804aa0afc8d4462b22e36fc259393b64
diff --git a/trunk/drivers/staging/winbond/mds.c b/trunk/drivers/staging/winbond/mds.c
index 9ac2c874ef05..90f2cc019d3b 100644
--- a/trunk/drivers/staging/winbond/mds.c
+++ b/trunk/drivers/staging/winbond/mds.c
@@ -18,11 +18,6 @@ Mds_initial(struct wbsoft_priv *adapter)
 	return hal_get_tx_buffer(&adapter->sHwData, &pMds->pTxBuffer);
 }
 
-void
-Mds_Destroy(struct wbsoft_priv *adapter)
-{
-}
-
 static void Mds_DurationSet(struct wbsoft_priv *adapter,  struct wb35_descriptor *pDes,  u8 *buffer)
 {
 	struct T00_descriptor *pT00;
diff --git a/trunk/drivers/staging/winbond/mds_f.h b/trunk/drivers/staging/winbond/mds_f.h
index d902843e8aed..ce8be079e957 100644
--- a/trunk/drivers/staging/winbond/mds_f.h
+++ b/trunk/drivers/staging/winbond/mds_f.h
@@ -5,7 +5,6 @@
 #include "core.h"
 
 unsigned char Mds_initial(struct wbsoft_priv *adapter);
-void Mds_Destroy(struct wbsoft_priv *adapter);
 void Mds_Tx(struct wbsoft_priv *adapter);
 void Mds_SendComplete(struct wbsoft_priv *adapter, struct T02_descriptor *pt02);
 void Mds_MpduProcess(struct wbsoft_priv *adapter, struct wb35_descriptor *prxdes);
diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
index df055abf5c42..82040f457a03 100644
--- a/trunk/drivers/staging/winbond/wbusb.c
+++ b/trunk/drivers/staging/winbond/wbusb.c
@@ -863,8 +863,6 @@ static void hal_halt(struct hw_data *pHwData)
 
 static void wb35_hw_halt(struct wbsoft_priv *adapter)
 {
-	Mds_Destroy(adapter);
-
 	/* Turn off Rx and Tx hardware ability */
 	hal_stop(&adapter->sHwData);
 #ifdef _PE_USB_INI_DUMP_