From c8b2b70b4334acbbc4daa445aa21b1fe6d337ac3 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Mon, 27 Oct 2008 22:47:12 +0200 Subject: [PATCH] Staging: w35und: OS_MEMORY_ALLOC wrapper removal 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(-) diff --git a/drivers/staging/winbond/adapter.h b/drivers/staging/winbond/adapter.h index fc4205d..e102dcb 100644 --- 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 diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c index 47b5a7d..56ad504 100644 --- a/drivers/staging/winbond/linux/wb35reg.c +++ b/drivers/staging/winbond/linux/wb35reg.c @@ -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 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 RegisterNo, u32 RegisterValue ) // 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_t pHwData, u16 RegisterNo, u32 Register // 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 RegisterNo, u32 * pRegisterValue ) // 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 ) { diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c index 9593a60..e492fa5 100644 --- 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; } diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c index 460f42ad8..a9a605b 100644 --- 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) { diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h index 1d09c65..f19c0ee 100644 --- 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 ); -- 2.7.4