diff options
| author | Pekka Enberg | 2008-10-21 10:45:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2008-10-22 18:56:38 +0200 |
| commit | a1eb2ba6be72988b2479f749acfdc3bdce41654b (patch) | |
| tree | 5b1a352a9d22a2ce132d6a0308dee4fa4c24242a /drivers/staging/winbond/wblinux.c | |
| parent | Staging: sxg: fix compiler warnings. (diff) | |
| download | kernel-qcow2-linux-a1eb2ba6be72988b2479f749acfdc3bdce41654b.tar.gz kernel-qcow2-linux-a1eb2ba6be72988b2479f749acfdc3bdce41654b.tar.xz kernel-qcow2-linux-a1eb2ba6be72988b2479f749acfdc3bdce41654b.zip | |
Staging: w35und: remove spinlock wrappers
This patch removes the OS_SPIN_LOCK and related wrappers from the driver code.
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/wblinux.c')
| -rw-r--r-- | drivers/staging/winbond/wblinux.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c index 51dad95b48b8..186ad6029c7b 100644 --- a/drivers/staging/winbond/wblinux.c +++ b/drivers/staging/winbond/wblinux.c @@ -26,10 +26,10 @@ EncapAtomicInc(PADAPTER Adapter, void* pAtomic) PWBLINUX pWbLinux = &Adapter->WbLinux; u32 ltmp; u32 * pltmp = (u32 *)pAtomic; - OS_SPIN_LOCK_ACQUIRED( &pWbLinux->AtomicSpinLock ); + spin_lock_irq( &pWbLinux->AtomicSpinLock ); (*pltmp)++; ltmp = (*pltmp); - OS_SPIN_LOCK_RELEASED( &pWbLinux->AtomicSpinLock ); + spin_unlock_irq( &pWbLinux->AtomicSpinLock ); return ltmp; } @@ -39,10 +39,10 @@ EncapAtomicDec(PADAPTER Adapter, void* pAtomic) PWBLINUX pWbLinux = &Adapter->WbLinux; u32 ltmp; u32 * pltmp = (u32 *)pAtomic; - OS_SPIN_LOCK_ACQUIRED( &pWbLinux->AtomicSpinLock ); + spin_lock_irq( &pWbLinux->AtomicSpinLock ); (*pltmp)--; ltmp = (*pltmp); - OS_SPIN_LOCK_RELEASED( &pWbLinux->AtomicSpinLock ); + spin_unlock_irq( &pWbLinux->AtomicSpinLock ); return ltmp; } @@ -51,8 +51,8 @@ WBLINUX_Initial(PADAPTER Adapter) { PWBLINUX pWbLinux = &Adapter->WbLinux; - OS_SPIN_LOCK_ALLOCATE( &pWbLinux->SpinLock ); - OS_SPIN_LOCK_ALLOCATE( &pWbLinux->AtomicSpinLock ); + spin_lock_init( &pWbLinux->SpinLock ); + spin_lock_init( &pWbLinux->AtomicSpinLock ); return TRUE; } @@ -79,7 +79,6 @@ void WBLINUX_Destroy(PADAPTER Adapter) { WBLINUX_stop( Adapter ); - OS_SPIN_LOCK_FREE( &pWbNdis->SpinLock ); #ifdef _PE_USB_INI_DUMP_ WBDEBUG(("[w35und] unregister_netdev!\n")); #endif |