Staging: w35und: OS_MEMORY_ALLOC wrapper removal

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / linux / wb35reg.c

diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c
index 47b5a7d801f6df465339ab61421555e8cb8203d1..56ad504bb06d966dd2cb0bf719d60a8bb1323800 100644 (file)
--- 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* *)&reg_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* *)&reg_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* *) &reg_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* *)&reg_queue, UrbSize );
+       reg_queue = kzalloc(UrbSize, GFP_ATOMIC);
        urb = usb_alloc_urb(0, GFP_ATOMIC);
        if( urb && reg_queue )
        {