evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: w35und: remove usb_alloc_urb wrapper function

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2008-10-27 14:21:24 -07:00
parent 7c12604380
commit f3d201886d
4 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/winbond/linux/wb35reg.c
View file

@ -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 // Trying to use burst write function if use new hardware
UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest); UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest);
OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize ); OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize );
urb = wb_usb_alloc_urb(0); urb = usb_alloc_urb(0, GFP_ATOMIC);
if( urb && reg_queue ) { if( urb && reg_queue ) {
reg_queue->DIRECT = 2;// burst write register reg_queue->DIRECT = 2;// burst write register
reg_queue->INDEX = RegisterNo; 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------------------------------------ // update the register by send urb request------------------------------------
UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest); UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize ); OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize );
urb = wb_usb_alloc_urb(0); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (urb && reg_queue) { if (urb && reg_queue) {
reg_queue->DIRECT = 1;// burst write register reg_queue->DIRECT = 1;// burst write register
reg_queue->INDEX = RegisterNo; 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------------------------------------ // update the register by send urb request------------------------------------
UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest); UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
OS_MEMORY_ALLOC((void* *) &reg_queue, UrbSize ); OS_MEMORY_ALLOC((void* *) &reg_queue, UrbSize );
urb = wb_usb_alloc_urb(0); urb = usb_alloc_urb(0, GFP_ATOMIC);
if (urb && reg_queue) { if (urb && reg_queue) {
reg_queue->DIRECT = 1;// burst write register reg_queue->DIRECT = 1;// burst write register
reg_queue->INDEX = RegisterNo; 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 ------------------------------------ // update the variable by send Urb to read register ------------------------------------
UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest); UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize ); OS_MEMORY_ALLOC( (void* *)&reg_queue, UrbSize );
urb = wb_usb_alloc_urb(0); urb = usb_alloc_urb(0, GFP_ATOMIC);
if( urb && reg_queue ) if( urb && reg_queue )
{ {
reg_queue->DIRECT = 0;// read register reg_queue->DIRECT = 0;// read register

2
drivers/staging/winbond/linux/wb35rx.c
View file

@ -168,7 +168,7 @@ unsigned char Wb35Rx_initial(phw_data_t pHwData)
// Initial the Buffer Queue // Initial the Buffer Queue
Wb35Rx_reset_descriptor( pHwData ); Wb35Rx_reset_descriptor( pHwData );
pWb35Rx->RxUrb = wb_usb_alloc_urb(0); pWb35Rx->RxUrb = usb_alloc_urb(0, GFP_ATOMIC);
return (!!pWb35Rx->RxUrb); return (!!pWb35Rx->RxUrb);
} }

4
drivers/staging/winbond/linux/wb35tx.c
View file

@ -134,11 +134,11 @@ unsigned char Wb35Tx_initial(phw_data_t pHwData)
{ {
PWB35TX pWb35Tx = &pHwData->Wb35Tx; PWB35TX pWb35Tx = &pHwData->Wb35Tx;
pWb35Tx->Tx4Urb = wb_usb_alloc_urb(0); pWb35Tx->Tx4Urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!pWb35Tx->Tx4Urb) if (!pWb35Tx->Tx4Urb)
return FALSE; return FALSE;
pWb35Tx->Tx2Urb = wb_usb_alloc_urb(0); pWb35Tx->Tx2Urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!pWb35Tx->Tx2Urb) if (!pWb35Tx->Tx2Urb)
{ {
usb_free_urb( pWb35Tx->Tx4Urb ); usb_free_urb( pWb35Tx->Tx4Urb );

7
drivers/staging/winbond/linux/wbusb_f.h
View file

@ -16,12 +16,5 @@ void WbUsb_destroy(phw_data_t pHwData);
unsigned char WbWLanInitialize(struct wb35_adapter *adapter); unsigned char WbWLanInitialize(struct wb35_adapter *adapter);
#define WbUsb_Stop( _A ) #define WbUsb_Stop( _A )
#define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC)
#define WbUsb_CheckForHang( _P ) #define WbUsb_CheckForHang( _P )
#define WbUsb_DetectStart( _P, _I ) #define WbUsb_DetectStart( _P, _I )