diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:37 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:48 -0800 |
commit | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (patch) | |
tree | 0495947ed407127111be30342b6ade46f6fc9d1b /drivers/staging/winbond/wbhal.c | |
parent | 42c84bb4603d5a375b1c8dbbbef686d24e804807 (diff) |
Staging: w35und: clean up adapter.h a bit
This patch cleans up adapter.h a bit in preparation for merging struct
wb35_adapter to struct wbsoft_priv.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/wbhal.c')
-rw-r--r-- | drivers/staging/winbond/wbhal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c index da39eef7dce..1fb8c3d7846 100644 --- a/drivers/staging/winbond/wbhal.c +++ b/drivers/staging/winbond/wbhal.c @@ -223,8 +223,8 @@ static void hal_led_control(unsigned long data) else { // Is transmitting/receiving ?? - if( (OS_CURRENT_RX_BYTE( adapter ) != pHwData->RxByteCountLast ) || - (OS_CURRENT_TX_BYTE( adapter ) != pHwData->TxByteCountLast ) ) + if( (adapter->RxByteCount != pHwData->RxByteCountLast ) || + (adapter->TxByteCount != pHwData->TxByteCountLast ) ) { if( (reg->U1BC_LEDConfigure & 0x3000) != 0x3000 ) { @@ -233,8 +233,8 @@ static void hal_led_control(unsigned long data) } // Update variable - pHwData->RxByteCountLast = OS_CURRENT_RX_BYTE( adapter ); - pHwData->TxByteCountLast = OS_CURRENT_TX_BYTE( adapter ); + pHwData->RxByteCountLast = adapter->RxByteCount; + pHwData->TxByteCountLast = adapter->TxByteCount; TimeInterval = 200; } else @@ -849,7 +849,7 @@ void hal_surprise_remove(struct wb35_adapter *adapter) #ifdef _PE_STATE_DUMP_ WBDEBUG(("Calling hal_surprise_remove\n")); #endif - OS_STOP( adapter ); + WBLINUX_stop( adapter ); } } |