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

Staging: w35und: OS_MEMORY_ALLOC wrapper removal 



This patch removes the rather scary OS_MEMORY_ALLOC macro.

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

drivers/staging/winbond/adapter.h

+0 −1
Original line number Original line Diff line number Diff line 
#define OS_MEMORY_ALLOC( _V, _S )	WBLINUX_MemoryAlloc( _V, _S )

#define OS_LINK_STATUS			(adapter->LinkStatus == OS_CONNECTED)

#define OS_LINK_STATUS			(adapter->LinkStatus == OS_CONNECTED)

#define OS_SET_SHUTDOWN( _A )		_A->shutdown=1

#define OS_SET_SHUTDOWN( _A )		_A->shutdown=1

#define OS_SET_RESUME( _A )		_A->shutdown=0

#define OS_SET_RESUME( _A )		_A->shutdown=0

drivers/staging/winbond/linux/wb35reg.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N 




	// Trying to use burst write function if use new hardware

	// Trying to use burst write function if use new hardware

	UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest);

	UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest);

	OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize );

	reg_queue = kzalloc(UrbSize, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if( urb && reg_queue ) {

	if( urb && reg_queue ) {

		reg_queue->DIRECT = 2;// burst write register

		reg_queue->DIRECT = 2;// burst write register
@@ -174,7 +174,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 




	// update the register by send urb request------------------------------------

	// update the register by send urb request------------------------------------

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);

	OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize );

	reg_queue = kzalloc(UrbSize, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (urb && reg_queue) {

	if (urb && reg_queue) {

		reg_queue->DIRECT = 1;// burst write register

		reg_queue->DIRECT = 1;// burst write register
@@ -234,7 +234,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register 




	// update the register by send urb request------------------------------------

	// update the register by send urb request------------------------------------

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);

	OS_MEMORY_ALLOC((void* *) &reg_queue, UrbSize );

	reg_queue = kzalloc(UrbSize, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if (urb && reg_queue) {

	if (urb && reg_queue) {

		reg_queue->DIRECT = 1;// burst write register

		reg_queue->DIRECT = 1;// burst write register
@@ -341,7 +341,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 




	// update the variable by send Urb to read register ------------------------------------

	// update the variable by send Urb to read register ------------------------------------

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);

	UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);

	OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize );

	reg_queue = kzalloc(UrbSize, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	urb = usb_alloc_urb(0, GFP_ATOMIC);

	if( urb && reg_queue )

	if( urb && reg_queue )

	{

	{

drivers/staging/winbond/linux/wb35rx.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,8 @@ void Wb35Rx( phw_data_t pHwData ) 




	pWb35Rx->CurrentRxBufferId = RxBufferId;

	pWb35Rx->CurrentRxBufferId = RxBufferId;





	if (1 != OS_MEMORY_ALLOC((void* *)&pWb35Rx->pDRx, MAX_USB_RX_BUFFER)) {

	pWb35Rx->pDRx = kzalloc(MAX_USB_RX_BUFFER, GFP_ATOMIC);

	if (!pWb35Rx->pDRx) {

		printk("w35und: Rx memory alloc failed\n");

		printk("w35und: Rx memory alloc failed\n");

		goto error;

		goto error;

	}

	}

drivers/staging/winbond/wblinux.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -10,16 +10,6 @@ 
//============================================================================

//============================================================================

#include "os_common.h"

#include "os_common.h"





u32

WBLINUX_MemoryAlloc(void* *VirtualAddress, u32 Length)

{

	*VirtualAddress = kzalloc( Length, GFP_ATOMIC ); //GFP_KERNEL is not suitable



	if (*VirtualAddress == NULL)

		return 0;

	return 1;

}



s32

s32

EncapAtomicInc(struct wb35_adapter * adapter, void* pAtomic)

EncapAtomicInc(struct wb35_adapter * adapter, void* pAtomic)

{

{

drivers/staging/winbond/wblinux_f.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ 
//

//

// wblinux_f.h

// wblinux_f.h

//

//

u32 WBLINUX_MemoryAlloc(  void* *VirtualAddress,  u32 Length );

s32 EncapAtomicInc(  struct wb35_adapter *adapter,  void* pAtomic );

s32 EncapAtomicInc(  struct wb35_adapter *adapter,  void* pAtomic );

s32 EncapAtomicDec(  struct wb35_adapter *adapter,  void* pAtomic );

s32 EncapAtomicDec(  struct wb35_adapter *adapter,  void* pAtomic );

void WBLinux_ReceivePacket(  struct wb35_adapter *adapter,  PRXLAYER1 pRxLayer1 );

void WBLinux_ReceivePacket(  struct wb35_adapter *adapter,  PRXLAYER1 pRxLayer1 );