Staging: w35und: remove usb_alloc_urb wrapper function

No need for a simple wrapper here.

Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c
index c2864b11a5c5fadcf1bbc4fa06e61f0707294566..191322d2d171ded858bbcbf4285ae73de5d17dbc 100644 (file)
--- a/drivers/staging/winbond/linux/wb35reg.c
+++ b/drivers/staging/winbond/linux/wb35reg.c
@@ -26,7 +26,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 );
-       urb = wb_usb_alloc_urb(0);
+       urb = usb_alloc_urb(0, GFP_ATOMIC);
        if( urb && reg_queue ) {
                reg_queue->DIRECT = 2;// burst write register
                reg_queue->INDEX = RegisterNo;
@@ -175,7 +175,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 );
-       urb = wb_usb_alloc_urb(0);
+       urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (urb && reg_queue) {
                reg_queue->DIRECT = 1;// burst write register
                reg_queue->INDEX = RegisterNo;
@@ -235,7 +235,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 );
-       urb = wb_usb_alloc_urb(0);
+       urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (urb && reg_queue) {
                reg_queue->DIRECT = 1;// burst write register
                reg_queue->INDEX = RegisterNo;
@@ -342,7 +342,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 );
-       urb = wb_usb_alloc_urb(0);
+       urb = usb_alloc_urb(0, GFP_ATOMIC);
        if( urb && reg_queue )
        {
                reg_queue->DIRECT = 0;// read register

diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c
index e565746713ed9d924ed0f6da2f12ca52068ea6ad..13269968d17ac733d9617ad7c05359e24864d821 100644 (file)
--- a/drivers/staging/winbond/linux/wb35rx.c
+++ b/drivers/staging/winbond/linux/wb35rx.c
@@ -168,7 +168,7 @@ unsigned char Wb35Rx_initial(phw_data_t pHwData)
        // Initial the Buffer Queue
        Wb35Rx_reset_descriptor( pHwData );
 
-       pWb35Rx->RxUrb = wb_usb_alloc_urb(0);
+       pWb35Rx->RxUrb = usb_alloc_urb(0, GFP_ATOMIC);
        return (!!pWb35Rx->RxUrb);
 }
 

diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/linux/wb35tx.c
index c54ef30a577bad9d9d4a0afb70e1460faa544be6..9c928eec2f4aefb92460a92a2f965d7128ab690d 100644 (file)
--- a/drivers/staging/winbond/linux/wb35tx.c
+++ b/drivers/staging/winbond/linux/wb35tx.c
@@ -134,11 +134,11 @@ unsigned char Wb35Tx_initial(phw_data_t pHwData)
 {
        PWB35TX pWb35Tx = &pHwData->Wb35Tx;
 
-       pWb35Tx->Tx4Urb = wb_usb_alloc_urb(0);
+       pWb35Tx->Tx4Urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!pWb35Tx->Tx4Urb)
                return FALSE;
 
-       pWb35Tx->Tx2Urb = wb_usb_alloc_urb(0);
+       pWb35Tx->Tx2Urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!pWb35Tx->Tx2Urb)
        {
                usb_free_urb( pWb35Tx->Tx4Urb );

diff --git a/drivers/staging/winbond/linux/wbusb_f.h b/drivers/staging/winbond/linux/wbusb_f.h
index db47e1d862534037ba31541172923073c73cd18d..dd633ba401fec88cfd6bbcb410d644f861a90875 100644 (file)
--- a/drivers/staging/winbond/linux/wbusb_f.h
+++ b/drivers/staging/winbond/linux/wbusb_f.h
@@ -16,12 +16,5 @@ void WbUsb_destroy(phw_data_t pHwData);
 unsigned char WbWLanInitialize(struct wb35_adapter *adapter);
 #define        WbUsb_Stop( _A )
 
-#define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC)
-
 #define WbUsb_CheckForHang( _P )
 #define WbUsb_DetectStart( _P, _I )
-
-
-
-
-