w35und: Kill empty Mds_Destroy function
PATCH 1/4 w35und: Kill empty Mds_Destroy function
The Mds_Destroy() function doesn't do anything so kill it.
--- drivers/staging/winbond/mds.c | 5 ----- drivers/staging/winbond/mds_f.h | 1 - drivers/staging/winbond/wbusb.c | 2 -- 3 files changed, 0 insertions(+), 8 deletions(-)
drivers/staging/winbond/mds.c +0 -5
@@ -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;
drivers/staging/winbond/mds_f.h +0 -1
@@ -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);
drivers/staging/winbond/wbusb.c +0 -2
@@ -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_
Signature · 1 line
1.7.0.4
PATCH 2/4 w35und: Kill struct hwdata ->NullPacketCount
This patch kills the NullPacketCount member of struct hwdata. It's not used for anything so it's safe to remove it.
--- drivers/staging/winbond/wbhal.h | 6 ------ drivers/staging/winbond/wbusb.c | 9 --------- 2 files changed, 0 insertions(+), 15 deletions(-)
drivers/staging/winbond/wbhal.h +0 -6
@@ -342,9 +342,6 @@ struct wb35_descriptor { /* Skip length = 8 DWORD */void *buffer_address[MAX_DESCRIPTOR_BUFFER_INDEX ]; }; - -#define DEFAULT_NULL_PACKET_COUNT 180000/* 180 seconds */ -#define MAX_TXVGA_EEPROM 9/* How many word(u16) of EEPROM will be used for TxVGA */ #define MAX_RF_PARAMETER 32
@@ -517,9 +514,6 @@ struct hw_data {/* For error recover */ u32 HwStop; - -/* For avoid AP disconnect */ - u32 NullPacketCount; };#endif
drivers/staging/winbond/wbusb.c +0 -9
@@ -611,15 +611,6 @@ static void hal_led_control(unsigned long data) }break ; } - -/* Active send null packet to avoid AP disconnect */ -if (pHwData->LED_LinkOn) { - pHwData->NullPacketCount += TimeInterval; -if (pHwData->NullPacketCount >= -DEFAULT_NULL_PACKET_COUNT ) { - pHwData->NullPacketCount =0 ; - } - } } pHwData->time_count += TimeInterval;
Signature · 1 line
1.7.0.4
Re: [PATCH 2/4] w35und: Kill struct hwdata ->NullPacketCount
Quoted 5 lines · Pekka Enberg
This patch kills the NullPacketCount member of struct hwdata. It's not used for anything so it's safe to remove it.
Cc Pavel Machek <[email protected]>Signed-off-by Pekka Enberg <[email protected]>
ACK.
Quoted 49 lines
--- drivers/staging/winbond/wbhal.h | 6 ------ drivers/staging/winbond/wbusb.c | 9 --------- 2 files changed, 0 insertions(+), 15 deletions(-)drivers/staging/winbond/wbhal.h +0
-6@@ -342,9 +342,6 @@ struct wb35_descriptor { /* Skip length = 8 DWORD */void *buffer_address[MAX_DESCRIPTOR_BUFFER_INDEX ]; }; - -#define DEFAULT_NULL_PACKET_COUNT 180000/* 180 seconds */ -#define MAX_TXVGA_EEPROM 9/* How many word(u16) of EEPROM will be used for TxVGA */ #define MAX_RF_PARAMETER 32@@ -517,9 +514,6 @@ struct hw_data {/* For error recover */ u32 HwStop; - -/* For avoid AP disconnect */ - u32 NullPacketCount; };#endif drivers/staging/winbond/wbusb.c +0
-9@@ -611,15 +611,6 @@ static void hal_led_control(unsigned long data) }break ; } - -/* Active send null packet to avoid AP disconnect */ -if (pHwData->LED_LinkOn) { - pHwData->NullPacketCount += TimeInterval; -if (pHwData->NullPacketCount >= -DEFAULT_NULL_PACKET_COUNT ) { - pHwData->NullPacketCount =0 ; - } - } } pHwData->time_count += TimeInterval;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 3/4 w35und: Kill struct hwdata ->HwStop
In reply to Pekka EnbergThis patch kills the ->HwStop member of struct hwdata. It's a read-only variable that's always zero so it's safe to remove it.
--- drivers/staging/winbond/wb35rx.c | 4 ++-- drivers/staging/winbond/wb35tx.c | 8 ++++---- drivers/staging/winbond/wbhal.h | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/staging/winbond/wb35rx.c +2 -2
@@ -174,7 +174,7 @@ static void Wb35Rx_Complete(struct urb *urb)/* The IRP is completed */ pWb35Rx->EP3vm_state =VM_COMPLETED ; -if (pHwData->SurpriseRemove || pHwData->HwStop)/* Must be here, or RxBufferId is invalid */ +if (pHwData->SurpriseRemove)/* Must be here, or RxBufferId is invalid */ goto error;if (pWb35Rx->rx_halt)
@@ -239,7 +239,7 @@ static void Wb35Rx(struct ieee80211_hw *hw)u32 RxBufferId;/* Issuing URB */ -if (pHwData->SurpriseRemove || pHwData->HwStop) +if (pHwData->SurpriseRemove) goto error;if (pWb35Rx->rx_halt)
drivers/staging/winbond/wb35tx.c +4 -4
@@ -41,7 +41,7 @@ static void Wb35Tx_complete(struct urb * pUrb) pWb35Tx->TxSendIndex++; pWb35Tx->TxSendIndex %=MAX_USB_TX_BUFFER_NUMBER ; -if (pHwData->SurpriseRemove || pHwData->HwStop)// Let WbWlanHalt to handle surprise remove +if (pHwData->SurpriseRemove)// Let WbWlanHalt to handle surprise remove goto error;if (pWb35Tx->tx_halt)
@@ -74,7 +74,7 @@ static void Wb35Tx(struct wbsoft_priv *adapter)u32 SendIndex; -if (pHwData->SurpriseRemove || pHwData->HwStop) +if (pHwData->SurpriseRemove) goto cleanup;if (pWb35Tx->tx_halt)
@@ -222,7 +222,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb) pWb35Tx->EP2VM_status = pUrb->status;// For Linux 2.4. Interrupt will always trigger -if (pHwData->SurpriseRemove || pHwData->HwStop)// Let WbWlanHalt to handle surprise remove +if (pHwData->SurpriseRemove)// Let WbWlanHalt to handle surprise remove goto error;if (pWb35Tx->tx_halt)
@@ -263,7 +263,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)u32 * pltmp = (u32 *)pWb35Tx->EP2_buf;int retv; -if (pHwData->SurpriseRemove || pHwData->HwStop) +if (pHwData->SurpriseRemove) goto error;if (pWb35Tx->tx_halt)
drivers/staging/winbond/wbhal.h +0 -3
@@ -511,9 +511,6 @@ struct hw_data {/* For global timer */ u32 time_count; /* TICK_TIME_100ms 1 = 100ms */ - -/* For error recover */ - u32 HwStop; };#endif
Signature · 1 line
1.7.0.4
PATCH 4/4 w35und: Kill struct hwdata ->SurpriseRemoveCount
In reply to Pekka EnbergThis patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not used at all so it's safe to remove it.
--- drivers/staging/winbond/wbhal.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/staging/winbond/wbhal.h +0 -2
@@ -507,8 +507,6 @@ struct hw_data {u32 RxByteCountLast;u32 TxByteCountLast; -atomic_t SurpriseRemoveCount; -/* For global timer */ u32 time_count;/* TICK_TIME_100ms 1 = 100ms */ };
Signature · 1 line
1.7.0.4
Quoted 4 lines · Pekka Enberg
The
Mds_Destroy()function doesn't do anything so kill it.Cc Pavel Machek <[email protected]>Signed-off-by Pekka Enberg <[email protected]>
ACK.
Quoted 47 lines
--- drivers/staging/winbond/mds.c | 5 ----- drivers/staging/winbond/mds_f.h | 1 - drivers/staging/winbond/wbusb.c | 2 -- 3 files changed, 0 insertions(+), 8 deletions(-)drivers/staging/winbond/mds.c +0
-5@@ -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;drivers/staging/winbond/mds_f.h +0
-1@@ -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);drivers/staging/winbond/wbusb.c +0
-2@@ -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_
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html