Skip to content

Commit

Permalink
Staging: w35und: Kill struct hwdata ->HwStop
Browse files Browse the repository at this point in the history
This 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.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Nov 10, 2010
1 parent 4d0d302 commit 87cb9a6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/winbond/wb35rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/winbond/wb35tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/winbond/wbhal.h
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,6 @@ struct hw_data {

/* For global timer */
u32 time_count; /* TICK_TIME_100ms 1 = 100ms */

/* For error recover */
u32 HwStop;
};

#endif

0 comments on commit 87cb9a6

Please sign in to comment.