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

Staging: w35und: remove spinlock wrappers 



This patch removes the OS_SPIN_LOCK and related wrappers from the driver code.

Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d78404cc

drivers/staging/winbond/linux/common.h

+0 −7
Original line number Diff line number Diff line
@@ -105,13 +105,6 @@ typedef struct urb * PURB; 
#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_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_INITIAL( _T, _F, _P )			\

{							\

drivers/staging/winbond/linux/wb35reg.c

+17 −20
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N 
		pRegQueue->pUsbReq = dr;

		pRegQueue->pUrb = pUrb;



		OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock );

		spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );

		if (pWb35Reg->pRegFirst == NULL)

			pWb35Reg->pRegFirst = pRegQueue;

		else

			pWb35Reg->pRegLast->Next = pRegQueue;

		pWb35Reg->pRegLast = pRegQueue;



		OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );

		spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );



		// Start EP0VM

		Wb35Reg_EP0VM_start(pHwData);
@@ -193,14 +193,14 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 
		pRegQueue->pUsbReq = dr;

		pRegQueue->pUrb = pUrb;



		OS_SPIN_LOCK_ACQUIRED(&pWb35Reg->EP0VM_spin_lock );

		spin_lock_irq(&pWb35Reg->EP0VM_spin_lock );

		if (pWb35Reg->pRegFirst == NULL)

			pWb35Reg->pRegFirst = pRegQueue;

		else

			pWb35Reg->pRegLast->Next = pRegQueue;

		pWb35Reg->pRegLast = pRegQueue;



		OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );

		spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );



		// Start EP0VM

		Wb35Reg_EP0VM_start(pHwData);
@@ -254,14 +254,14 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 
		pRegQueue->Next = NULL;

		pRegQueue->pUsbReq = dr;

		pRegQueue->pUrb = pUrb;

		OS_SPIN_LOCK_ACQUIRED (&pWb35Reg->EP0VM_spin_lock );

		spin_lock_irq (&pWb35Reg->EP0VM_spin_lock );

		if( pWb35Reg->pRegFirst == NULL )

			pWb35Reg->pRegFirst = pRegQueue;

		else

			pWb35Reg->pRegLast->Next = pRegQueue;

		pWb35Reg->pRegLast = pRegQueue;



		OS_SPIN_LOCK_RELEASED ( &pWb35Reg->EP0VM_spin_lock );

		spin_unlock_irq ( &pWb35Reg->EP0VM_spin_lock );



		// Start EP0VM

		Wb35Reg_EP0VM_start(pHwData);
@@ -359,14 +359,14 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 
		pRegQueue->Next = NULL;

		pRegQueue->pUsbReq = dr;

		pRegQueue->pUrb = pUrb;

		OS_SPIN_LOCK_ACQUIRED ( &pWb35Reg->EP0VM_spin_lock );

		spin_lock_irq ( &pWb35Reg->EP0VM_spin_lock );

		if( pWb35Reg->pRegFirst == NULL )

			pWb35Reg->pRegFirst = pRegQueue;

		else

			pWb35Reg->pRegLast->Next = pRegQueue;

		pWb35Reg->pRegLast = pRegQueue;



		OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );

		spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );



		// Start EP0VM

		Wb35Reg_EP0VM_start( pHwData );
@@ -411,9 +411,9 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) 
		goto cleanup;



	// 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;

	OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );

	spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );



	if (!pRegQueue)

		goto cleanup;
@@ -468,12 +468,12 @@ Wb35Reg_EP0VM_complete(PURB pUrb) 
		OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Reg->RegFireCount );

	} else {

		// 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;

		if (pRegQueue == pWb35Reg->pRegLast)

			pWb35Reg->pRegLast = NULL;

		pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next;

		OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );

		spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );



		if (pWb35Reg->EP0VM_status) {

#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



	// Release all the data in RegQueue

	OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock );

	spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );

	pRegQueue = pWb35Reg->pRegFirst;

	while (pRegQueue) {

		if (pRegQueue == pWb35Reg->pRegLast)
@@ -521,7 +521,7 @@ Wb35Reg_destroy(phw_data_t pHwData) 
		pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next;



		pUrb = pRegQueue->pUrb;

		OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );

		spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );

		if (pUrb) {

			usb_free_urb(pUrb);

			kfree(pRegQueue);
@@ -530,14 +530,11 @@ Wb35Reg_destroy(phw_data_t pHwData) 
			WBDEBUG(("EP0 queue release error\n"));

			#endif

		}

		OS_SPIN_LOCK_ACQUIRED( &pWb35Reg->EP0VM_spin_lock );

		spin_lock_irq( &pWb35Reg->EP0VM_spin_lock );



		pRegQueue = pWb35Reg->pRegFirst;

	}

	OS_SPIN_LOCK_RELEASED( &pWb35Reg->EP0VM_spin_lock );



	// Free resource

	OS_SPIN_LOCK_FREE(  &pWb35Reg->EP0VM_spin_lock );

	spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock );

}



//====================================================================================
@@ -550,7 +547,7 @@ unsigned char Wb35Reg_initial(phw_data_t pHwData) 
	u32 SoftwareSet, VCO_trim, TxVga, Region_ScanInterval;



	// 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 ------------------------------------

	Wb35Reg_WriteSync( pHwData, 0x03b4, 0x080d0000 ); // Start EEPROM access + Read + address(0x0d)

drivers/staging/winbond/linux/wb35reg_s.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ typedef struct _WB35REG 
	//-------------------

	// VM

	//-------------------

	OS_SPIN_LOCK	EP0VM_spin_lock; // 4B

	spinlock_t	EP0VM_spin_lock; // 4B

	u32	        EP0VM_status;//$$

	PREG_QUEUE	    pRegFirst;

	PREG_QUEUE	    pRegLast;

drivers/staging/winbond/mlme_s.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ typedef struct _MLME_FRAME 
	u8			DataType;

	u8			IsInUsed;



	OS_SPIN_LOCK	MLMESpinLock;

	spinlock_t	MLMESpinLock;



    u8		TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];

	u8		TxMMPDUInUse[ (MAX_NUM_TX_MMPDU+3) & ~0x03 ];

drivers/staging/winbond/wblinux.c

+6 −7
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE