Commit 87cb9a63 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman

Staging: w35und: Kill struct hwdata ->HwStop

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: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4d0d3022
...@@ -174,7 +174,7 @@ static void Wb35Rx_Complete(struct urb *urb) ...@@ -174,7 +174,7 @@ static void Wb35Rx_Complete(struct urb *urb)
/* The IRP is completed */ /* The IRP is completed */
pWb35Rx->EP3vm_state = VM_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; goto error;
if (pWb35Rx->rx_halt) if (pWb35Rx->rx_halt)
...@@ -239,7 +239,7 @@ static void Wb35Rx(struct ieee80211_hw *hw) ...@@ -239,7 +239,7 @@ static void Wb35Rx(struct ieee80211_hw *hw)
u32 RxBufferId; u32 RxBufferId;
/* Issuing URB */ /* Issuing URB */
if (pHwData->SurpriseRemove || pHwData->HwStop) if (pHwData->SurpriseRemove)
goto error; goto error;
if (pWb35Rx->rx_halt) if (pWb35Rx->rx_halt)
......
...@@ -41,7 +41,7 @@ static void Wb35Tx_complete(struct urb * pUrb) ...@@ -41,7 +41,7 @@ static void Wb35Tx_complete(struct urb * pUrb)
pWb35Tx->TxSendIndex++; pWb35Tx->TxSendIndex++;
pWb35Tx->TxSendIndex %= MAX_USB_TX_BUFFER_NUMBER; 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; goto error;
if (pWb35Tx->tx_halt) if (pWb35Tx->tx_halt)
...@@ -74,7 +74,7 @@ static void Wb35Tx(struct wbsoft_priv *adapter) ...@@ -74,7 +74,7 @@ static void Wb35Tx(struct wbsoft_priv *adapter)
u32 SendIndex; u32 SendIndex;
if (pHwData->SurpriseRemove || pHwData->HwStop) if (pHwData->SurpriseRemove)
goto cleanup; goto cleanup;
if (pWb35Tx->tx_halt) if (pWb35Tx->tx_halt)
...@@ -222,7 +222,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb) ...@@ -222,7 +222,7 @@ static void Wb35Tx_EP2VM_complete(struct urb * pUrb)
pWb35Tx->EP2VM_status = pUrb->status; pWb35Tx->EP2VM_status = pUrb->status;
// For Linux 2.4. Interrupt will always trigger // 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; goto error;
if (pWb35Tx->tx_halt) if (pWb35Tx->tx_halt)
...@@ -263,7 +263,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter) ...@@ -263,7 +263,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)
u32 * pltmp = (u32 *)pWb35Tx->EP2_buf; u32 * pltmp = (u32 *)pWb35Tx->EP2_buf;
int retv; int retv;
if (pHwData->SurpriseRemove || pHwData->HwStop) if (pHwData->SurpriseRemove)
goto error; goto error;
if (pWb35Tx->tx_halt) if (pWb35Tx->tx_halt)
......
...@@ -511,9 +511,6 @@ struct hw_data { ...@@ -511,9 +511,6 @@ struct hw_data {
/* For global timer */ /* For global timer */
u32 time_count; /* TICK_TIME_100ms 1 = 100ms */ u32 time_count; /* TICK_TIME_100ms 1 = 100ms */
/* For error recover */
u32 HwStop;
}; };
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment