Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/winbond/wb35rx.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -511,9 +511,6 @@ struct hw_data { 


	/* For global timer */

	u32		time_count;	/* TICK_TIME_100ms 1 = 100ms */



	/* For error recover */

	u32		HwStop;

};



#endif