From penberg@cs.helsinki.fi Mon Oct 27 14:23:24 2008 From: Pekka J Enberg Date: Mon, 27 Oct 2008 22:47:12 +0200 (EET) Subject: Staging: w35und: OS_MEMORY_ALLOC wrapper removal To: greg@kroah.com Cc: pavel@suse.cz, linux-kernel@vger.kernel.org Message-ID: From: Pekka Enberg This patch removes the rather scary OS_MEMORY_ALLOC macro. Signed-off-by: Pekka Enberg Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman --- drivers/staging/winbond/adapter.h | 1 - drivers/staging/winbond/linux/wb35reg.c | 8 ++++---- drivers/staging/winbond/linux/wb35rx.c | 3 ++- drivers/staging/winbond/wblinux.c | 10 ---------- drivers/staging/winbond/wblinux_f.h | 1 - 5 files changed, 6 insertions(+), 17 deletions(-) --- a/drivers/staging/winbond/adapter.h +++ b/drivers/staging/winbond/adapter.h @@ -1,4 +1,3 @@ -#define OS_MEMORY_ALLOC( _V, _S ) WBLINUX_MemoryAlloc( _V, _S ) #define OS_LINK_STATUS (adapter->LinkStatus == OS_CONNECTED) #define OS_SET_SHUTDOWN( _A ) _A->shutdown=1 #define OS_SET_RESUME( _A ) _A->shutdown=0 --- a/drivers/staging/winbond/linux/wb35reg.c +++ b/drivers/staging/winbond/linux/wb35reg.c @@ -25,7 +25,7 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u // Trying to use burst write function if use new hardware UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest); - OS_MEMORY_ALLOC( (void* *)®_queue, UrbSize ); + reg_queue = kzalloc(UrbSize, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC); if( urb && reg_queue ) { reg_queue->DIRECT = 2;// burst write register @@ -174,7 +174,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 // update the register by send urb request------------------------------------ UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest); - OS_MEMORY_ALLOC( (void* *)®_queue, UrbSize ); + reg_queue = kzalloc(UrbSize, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC); if (urb && reg_queue) { reg_queue->DIRECT = 1;// burst write register @@ -234,7 +234,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data // update the register by send urb request------------------------------------ UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest); - OS_MEMORY_ALLOC((void* *) ®_queue, UrbSize ); + reg_queue = kzalloc(UrbSize, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC); if (urb && reg_queue) { reg_queue->DIRECT = 1;// burst write register @@ -341,7 +341,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 Reg // update the variable by send Urb to read register ------------------------------------ UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest); - OS_MEMORY_ALLOC( (void* *)®_queue, UrbSize ); + reg_queue = kzalloc(UrbSize, GFP_ATOMIC); urb = usb_alloc_urb(0, GFP_ATOMIC); if( urb && reg_queue ) { --- a/drivers/staging/winbond/linux/wb35rx.c +++ b/drivers/staging/winbond/linux/wb35rx.c @@ -57,7 +57,8 @@ void Wb35Rx( phw_data_t pHwData ) 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"); goto error; } --- a/drivers/staging/winbond/wblinux.c +++ b/drivers/staging/winbond/wblinux.c @@ -10,16 +10,6 @@ //============================================================================ #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 EncapAtomicInc(struct wb35_adapter * adapter, void* pAtomic) { --- a/drivers/staging/winbond/wblinux_f.h +++ b/drivers/staging/winbond/wblinux_f.h @@ -3,7 +3,6 @@ // // wblinux_f.h // -u32 WBLINUX_MemoryAlloc( void* *VirtualAddress, u32 Length ); s32 EncapAtomicInc( struct wb35_adapter *adapter, void* pAtomic ); s32 EncapAtomicDec( struct wb35_adapter *adapter, void* pAtomic ); void WBLinux_ReceivePacket( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1 );