Staging: w35und: remove usb_submit_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 041be8143f1f1bf3bd3c33897492ac2b7bb54d00..c2864b11a5c5fadcf1bbc4fa06e61f0707294566 100644 (file)
--- a/drivers/staging/winbond/linux/wb35reg.c
+++ b/drivers/staging/winbond/linux/wb35reg.c
@@ -434,7 +434,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData )
 
        reg->EP0vm_state = VM_RUNNING;
 
-       ret = wb_usb_submit_urb( urb );
+       ret = usb_submit_urb(urb, GFP_ATOMIC);
 
        if (ret < 0) {
 #ifdef _PE_REG_DUMP_

diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c
index ae91b620c097adf8f92dd9f115a9864bba267bbc..e565746713ed9d924ed0f6da2f12ca52068ea6ad 100644 (file)
--- a/drivers/staging/winbond/linux/wb35rx.c
+++ b/drivers/staging/winbond/linux/wb35rx.c
@@ -70,7 +70,7 @@ void Wb35Rx(  phw_data_t pHwData )
 
        pWb35Rx->EP3vm_state = VM_RUNNING;
 
-       retv = wb_usb_submit_urb(urb);
+       retv = usb_submit_urb(urb, GFP_ATOMIC);
 
        if (retv != 0) {
                printk("Rx URB sending error\n");

diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/linux/wb35tx.c
index 3c40e31993ba5b9ae3c6c45b24779f89f3c24d6f..c54ef30a577bad9d9d4a0afb70e1460faa544be6 100644 (file)
--- a/drivers/staging/winbond/linux/wb35tx.c
+++ b/drivers/staging/winbond/linux/wb35tx.c
@@ -65,7 +65,7 @@ void Wb35Tx(phw_data_t pHwData)
                          Wb35Tx_complete, pHwData);
 
        pWb35Tx->EP4vm_state = VM_RUNNING;
-       retv = wb_usb_submit_urb( pUrb );
+       retv = usb_submit_urb(pUrb, GFP_ATOMIC);
        if (retv<0) {
                printk("EP4 Tx Irp sending error\n");
                goto cleanup;
@@ -240,7 +240,7 @@ void Wb35Tx_EP2VM(phw_data_t pHwData)
                          pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, pHwData, 32);
 
        pWb35Tx->EP2vm_state = VM_RUNNING;
-       retv = wb_usb_submit_urb( pUrb );
+       retv = usb_submit_urb(pUrb, GFP_ATOMIC);
 
        if (retv < 0) {
                #ifdef _PE_TX_DUMP_

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