Staging: w35und: remove atomic op wrappers

Use the kernel provided atomic op functions and remove the OS_ATOMIC and
related wrapper macros.

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>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c
index e492fa581a4..f690298dea2 100644
--- a/drivers/staging/winbond/linux/wb35rx.c
+++ b/drivers/staging/winbond/linux/wb35rx.c
@@ -10,17 +10,16 @@
 //============================================================================
 #include "sysdef.h"
 
-
 void Wb35Rx_start(phw_data_t pHwData)
 {
         PWB35RX pWb35Rx = &pHwData->Wb35Rx;
 
         // Allow only one thread to run into the Wb35Rx() function
-        if (OS_ATOMIC_INC(pHwData->adapter, &pWb35Rx->RxFireCounter) == 1) {
+        if (atomic_inc_return(&pWb35Rx->RxFireCounter) == 1) {
                 pWb35Rx->EP3vm_state = VM_RUNNING;
                 Wb35Rx(pHwData);
         } else
-                OS_ATOMIC_DEC(pHwData->adapter, &pWb35Rx->RxFireCounter);
+                atomic_dec(&pWb35Rx->RxFireCounter);
 }
 
 // This function cannot reentrain
@@ -82,7 +81,7 @@ void Wb35Rx(  phw_data_t pHwData )
 error:
         // VM stop
         pWb35Rx->EP3vm_state = VM_STOP;
-        OS_ATOMIC_DEC( pHwData->adapter, &pWb35Rx->RxFireCounter );
+        atomic_dec(&pWb35Rx->RxFireCounter);
 }
 
 void Wb35Rx_Complete(struct urb *urb)
@@ -157,7 +156,7 @@ void Wb35Rx_Complete(struct urb *urb)
 
 error:
         pWb35Rx->RxOwner[ RxBufferId ] = 1; // Set the owner to hardware
-        OS_ATOMIC_DEC( pHwData->adapter, &pWb35Rx->RxFireCounter );
+        atomic_dec(&pWb35Rx->RxFireCounter);
         pWb35Rx->EP3vm_state = VM_STOP;
 }