iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: w35und: remove spinlock wrappers

Browse Source 
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>
This commit is contained in:
Pekka Enberg 2008-10-21 11:45:02 +03:00 committed by Greg Kroah-Hartman
parent d78404cc24
commit a1eb2ba6be
6 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/winbond/linux/common.h
View File

@ -105,13 +105,6 @@ typedef struct urb * PURB;
#define OS_MEMORY_CLEAR( _A, _S ) memset( (u8 *)_A,0,_S) #define OS_MEMORY_CLEAR( _A, _S ) memset( (u8 *)_A,0,_S)
#define OS_MEMORY_COMPARE( _A, _B, _S ) (memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different #define OS_MEMORY_COMPARE( _A, _B, _S ) (memcmp(_A,_B,_S)? 0 : 1) // Definition is reverse with Ndis 1: the same 0: different
#define OS_SPIN_LOCK spinlock_t
#define OS_SPIN_LOCK_ALLOCATE( _S ) spin_lock_init( _S );
#define OS_SPIN_LOCK_FREE( _S )
#define OS_SPIN_LOCK_ACQUIRED( _S ) spin_lock_irq( _S )
#define OS_SPIN_LOCK_RELEASED( _S ) spin_unlock_irq( _S );
#define OS_TIMER struct timer_list #define OS_TIMER struct timer_list
#define OS_TIMER_INITIAL( _T, _F, _P ) \ #define OS_TIMER_INITIAL( _T, _F, _P ) \
{ \ { \

37
drivers/staging/winbond/linux/wb35reg.c
View File

@ -46,14 +46,14 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N
pRegQueue->pUsbReq = dr; pRegQueue->pUsbReq = dr;
pRegQueue->pUrb = pUrb; pRegQueue->pUrb = pUrb;
OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock ); spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );
if (pWb35Reg->pRegFirst == NULL) if (pWb35Reg->pRegFirst == NULL)
pWb35Reg->pRegFirst = pRegQueue; pWb35Reg->pRegFirst = pRegQueue;
else else
pWb35Reg->pRegLast->Next = pRegQueue; pWb35Reg->pRegLast->Next = pRegQueue;
pWb35Reg->pRegLast = pRegQueue; pWb35Reg->pRegLast = pRegQueue;
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
// Start EP0VM // Start EP0VM
Wb35Reg_EP0VM_start(pHwData); Wb35Reg_EP0VM_start(pHwData);
@ -193,14 +193,14 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )
pRegQueue->pUsbReq = dr; pRegQueue->pUsbReq = dr;
pRegQueue->pUrb = pUrb; pRegQueue->pUrb = pUrb;
OS_SPIN_LOCK_ACQUIRED(&pWb35Reg->EP0VM_spin_lock ); spin_lock_irq(&pWb35Reg->EP0VM_spin_lock );
if (pWb35Reg->pRegFirst == NULL) if (pWb35Reg->pRegFirst == NULL)
pWb35Reg->pRegFirst = pRegQueue; pWb35Reg->pRegFirst = pRegQueue;
else else
pWb35Reg->pRegLast->Next = pRegQueue; pWb35Reg->pRegLast->Next = pRegQueue;
pWb35Reg->pRegLast = pRegQueue; pWb35Reg->pRegLast = pRegQueue;
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
// Start EP0VM // Start EP0VM
Wb35Reg_EP0VM_start(pHwData); Wb35Reg_EP0VM_start(pHwData);
@ -254,14 +254,14 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register
pRegQueue->Next = NULL; pRegQueue->Next = NULL;
pRegQueue->pUsbReq = dr; pRegQueue->pUsbReq = dr;
pRegQueue->pUrb = pUrb; pRegQueue->pUrb = pUrb;
OS_SPIN_LOCK_ACQUIRED (&pWb35Reg->EP0VM_spin_lock ); spin_lock_irq (&pWb35Reg->EP0VM_spin_lock );
if( pWb35Reg->pRegFirst == NULL ) if( pWb35Reg->pRegFirst == NULL )
pWb35Reg->pRegFirst = pRegQueue; pWb35Reg->pRegFirst = pRegQueue;
else else
pWb35Reg->pRegLast->Next = pRegQueue; pWb35Reg->pRegLast->Next = pRegQueue;
pWb35Reg->pRegLast = pRegQueue; pWb35Reg->pRegLast = pRegQueue;
OS_SPIN_LOCK_RELEASED ( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq ( &pWb35Reg->EP0VM_spin_lock );
// Start EP0VM // Start EP0VM
Wb35Reg_EP0VM_start(pHwData); Wb35Reg_EP0VM_start(pHwData);
@ -359,14 +359,14 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )
pRegQueue->Next = NULL; pRegQueue->Next = NULL;
pRegQueue->pUsbReq = dr; pRegQueue->pUsbReq = dr;
pRegQueue->pUrb = pUrb; pRegQueue->pUrb = pUrb;
OS_SPIN_LOCK_ACQUIRED ( &pWb35Reg->EP0VM_spin_lock ); spin_lock_irq ( &pWb35Reg->EP0VM_spin_lock );
if( pWb35Reg->pRegFirst == NULL ) if( pWb35Reg->pRegFirst == NULL )
pWb35Reg->pRegFirst = pRegQueue; pWb35Reg->pRegFirst = pRegQueue;
else else
pWb35Reg->pRegLast->Next = pRegQueue; pWb35Reg->pRegLast->Next = pRegQueue;
pWb35Reg->pRegLast = pRegQueue; pWb35Reg->pRegLast = pRegQueue;
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
// Start EP0VM // Start EP0VM
Wb35Reg_EP0VM_start( pHwData ); Wb35Reg_EP0VM_start( pHwData );
@ -411,9 +411,9 @@ Wb35Reg_EP0VM(phw_data_t pHwData )
goto cleanup; goto cleanup;
// Get the register data and send to USB through Irp // Get the register data and send to USB through Irp
OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock ); spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );
pRegQueue = pWb35Reg->pRegFirst; pRegQueue = pWb35Reg->pRegFirst;
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
if (!pRegQueue) if (!pRegQueue)
goto cleanup; goto cleanup;
@ -468,12 +468,12 @@ Wb35Reg_EP0VM_complete(PURB pUrb)
OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Reg->RegFireCount ); OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Reg->RegFireCount );
} else { } else {
// Complete to send, remove the URB from the first // Complete to send, remove the URB from the first
OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock ); spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );
pRegQueue = pWb35Reg->pRegFirst; pRegQueue = pWb35Reg->pRegFirst;
if (pRegQueue == pWb35Reg->pRegLast) if (pRegQueue == pWb35Reg->pRegLast)
pWb35Reg->pRegLast = NULL; pWb35Reg->pRegLast = NULL;
pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next; pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next;
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
if (pWb35Reg->EP0VM_status) { if (pWb35Reg->EP0VM_status) {
#ifdef _PE_REG_DUMP_ #ifdef _PE_REG_DUMP_
@ -513,7 +513,7 @@ Wb35Reg_destroy(phw_data_t pHwData)
OS_SLEEP(10000); // Delay for waiting function enter 940623.1.b OS_SLEEP(10000); // Delay for waiting function enter 940623.1.b
// Release all the data in RegQueue // Release all the data in RegQueue
OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock ); spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );
pRegQueue = pWb35Reg->pRegFirst; pRegQueue = pWb35Reg->pRegFirst;
while (pRegQueue) { while (pRegQueue) {
if (pRegQueue == pWb35Reg->pRegLast) if (pRegQueue == pWb35Reg->pRegLast)
@ -521,7 +521,7 @@ Wb35Reg_destroy(phw_data_t pHwData)
pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next; pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next;
pUrb = pRegQueue->pUrb; pUrb = pRegQueue->pUrb;
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
if (pUrb) { if (pUrb) {
usb_free_urb(pUrb); usb_free_urb(pUrb);
kfree(pRegQueue); kfree(pRegQueue);
@ -530,14 +530,11 @@ Wb35Reg_destroy(phw_data_t pHwData)
WBDEBUG(("EP0 queue release error\n")); WBDEBUG(("EP0 queue release error\n"));
#endif #endif
} }
OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock ); spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );
pRegQueue = pWb35Reg->pRegFirst; pRegQueue = pWb35Reg->pRegFirst;
} }
OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock ); spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );
// Free resource
OS_SPIN_LOCK_FREE( &pWb35Reg->EP0VM_spin_lock );
} }
//==================================================================================== //====================================================================================
@ -550,7 +547,7 @@ unsigned char Wb35Reg_initial(phw_data_t pHwData)
u32 SoftwareSet, VCO_trim, TxVga, Region_ScanInterval; u32 SoftwareSet, VCO_trim, TxVga, Region_ScanInterval;
// Spin lock is acquired for read and write IRP command // Spin lock is acquired for read and write IRP command
OS_SPIN_LOCK_ALLOCATE( &pWb35Reg->EP0VM_spin_lock ); spin_lock_init( &pWb35Reg->EP0VM_spin_lock );
// Getting RF module type from EEPROM ------------------------------------ // Getting RF module type from EEPROM ------------------------------------
Wb35Reg_WriteSync( pHwData, 0x03b4, 0x080d0000 ); // Start EEPROM access + Read + address(0x0d) Wb35Reg_WriteSync( pHwData, 0x03b4, 0x080d0000 ); // Start EEPROM access + Read + address(0x0d)

2
drivers/staging/winbond/linux/wb35reg_s.h
View File

@ -143,7 +143,7 @@ typedef struct _WB35REG
//------------------- //-------------------
// VM // VM
//------------------- //-------------------
OS_SPIN_LOCK EP0VM_spin_lock; // 4B spinlock_t EP0VM_spin_lock; // 4B
u32 EP0VM_status;//$$ u32 EP0VM_status;//$$
PREG_QUEUE pRegFirst; PREG_QUEUE pRegFirst;
PREG_QUEUE pRegLast; PREG_QUEUE pRegLast;

2
drivers/staging/winbond/mlme_s.h
View File

@ -130,7 +130,7 @@ typedef struct _MLME_FRAME
u8 DataType; u8 DataType;
u8 IsInUsed; u8 IsInUsed;
OS_SPIN_LOCK MLMESpinLock; spinlock_t MLMESpinLock;
u8 TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE]; u8 TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];
u8 TxMMPDUInUse[ (MAX_NUM_TX_MMPDU+3) & ~0x03 ]; u8 TxMMPDUInUse[ (MAX_NUM_TX_MMPDU+3) & ~0x03 ];

13
drivers/staging/winbond/wblinux.c
View File

@ -26,10 +26,10 @@ EncapAtomicInc(PADAPTER Adapter, void* pAtomic)
PWBLINUX pWbLinux = &Adapter->WbLinux; PWBLINUX pWbLinux = &Adapter->WbLinux;
u32 ltmp; u32 ltmp;
u32 * pltmp = (u32 *)pAtomic; u32 * pltmp = (u32 *)pAtomic;
OS_SPIN_LOCK_ACQUIRED( &pWbLinux->AtomicSpinLock ); spin_lock_irq( &pWbLinux->AtomicSpinLock );
(*pltmp)++; (*pltmp)++;
ltmp = (*pltmp); ltmp = (*pltmp);
OS_SPIN_LOCK_RELEASED( &pWbLinux->AtomicSpinLock ); spin_unlock_irq( &pWbLinux->AtomicSpinLock );
return ltmp; return ltmp;
} }
@ -39,10 +39,10 @@ EncapAtomicDec(PADAPTER Adapter, void* pAtomic)
PWBLINUX pWbLinux = &Adapter->WbLinux; PWBLINUX pWbLinux = &Adapter->WbLinux;
u32 ltmp; u32 ltmp;
u32 * pltmp = (u32 *)pAtomic; u32 * pltmp = (u32 *)pAtomic;
OS_SPIN_LOCK_ACQUIRED( &pWbLinux->AtomicSpinLock ); spin_lock_irq( &pWbLinux->AtomicSpinLock );
(*pltmp)--; (*pltmp)--;
ltmp = (*pltmp); ltmp = (*pltmp);
OS_SPIN_LOCK_RELEASED( &pWbLinux->AtomicSpinLock ); spin_unlock_irq( &pWbLinux->AtomicSpinLock );
return ltmp; return ltmp;
} }
@ -51,8 +51,8 @@ WBLINUX_Initial(PADAPTER Adapter)
{ {
PWBLINUX pWbLinux = &Adapter->WbLinux; PWBLINUX pWbLinux = &Adapter->WbLinux;
OS_SPIN_LOCK_ALLOCATE( &pWbLinux->SpinLock ); spin_lock_init( &pWbLinux->SpinLock );
OS_SPIN_LOCK_ALLOCATE( &pWbLinux->AtomicSpinLock ); spin_lock_init( &pWbLinux->AtomicSpinLock );
return TRUE; return TRUE;
} }
@ -79,7 +79,6 @@ void
WBLINUX_Destroy(PADAPTER Adapter) WBLINUX_Destroy(PADAPTER Adapter)
{ {
WBLINUX_stop( Adapter ); WBLINUX_stop( Adapter );
OS_SPIN_LOCK_FREE( &pWbNdis->SpinLock );
#ifdef _PE_USB_INI_DUMP_ #ifdef _PE_USB_INI_DUMP_
WBDEBUG(("[w35und] unregister_netdev!\n")); WBDEBUG(("[w35und] unregister_netdev!\n"));
#endif #endif

4
drivers/staging/winbond/wblinux_s.h
View File

@ -24,8 +24,8 @@
typedef struct _WBLINUX typedef struct _WBLINUX
{ {
OS_SPIN_LOCK AtomicSpinLock; spinlock_t AtomicSpinLock;
OS_SPIN_LOCK SpinLock; spinlock_t SpinLock;
u32 shutdown; u32 shutdown;
OS_ATOMIC ThreadCount; OS_ATOMIC ThreadCount;