diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-22 04:01:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 16:51:40 -0500 |
commit | a55a89b175a1802e89b5654e2b9ae84ed032ea22 (patch) | |
tree | d810a93a65f36832b791db0d8bd26050bac223ca /drivers/staging/winbond | |
parent | 3e855b2a08a6b084046050622f0ab044f0850cca (diff) |
Staging: w35und: purb typedef removal
This patch removes the struct urb pointer typedef from the driver code and
fixes up variable names that use the typedef while we're at it.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond')
-rw-r--r-- | drivers/staging/winbond/linux/common.h | 4 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35reg.c | 74 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35reg_f.h | 2 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35reg_s.h | 2 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35rx.c | 14 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35rx_f.h | 2 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wb35tx_f.h | 4 | ||||
-rw-r--r-- | drivers/staging/winbond/linux/wbusb_s.h | 2 |
8 files changed, 50 insertions, 54 deletions
diff --git a/drivers/staging/winbond/linux/common.h b/drivers/staging/winbond/linux/common.h index 712a86cfa68..64bd1c7dff6 100644 --- a/drivers/staging/winbond/linux/common.h +++ b/drivers/staging/winbond/linux/common.h | |||
@@ -69,10 +69,6 @@ | |||
69 | #define BIT(x) (1 << (x)) | 69 | #define BIT(x) (1 << (x)) |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | typedef struct urb * PURB; | ||
73 | |||
74 | |||
75 | |||
76 | //================================================================================================== | 72 | //================================================================================================== |
77 | // Common function definition | 73 | // Common function definition |
78 | //================================================================================================== | 74 | //================================================================================================== |
diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c index de4040bb762..b7560b5c556 100644 --- a/drivers/staging/winbond/linux/wb35reg.c +++ b/drivers/staging/winbond/linux/wb35reg.c | |||
@@ -13,7 +13,7 @@ unsigned char | |||
13 | Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 NumberOfData, u8 Flag) | 13 | Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 NumberOfData, u8 Flag) |
14 | { | 14 | { |
15 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 15 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
16 | PURB pUrb = NULL; | 16 | struct urb *urb = NULL; |
17 | PREG_QUEUE pRegQueue = NULL; | 17 | PREG_QUEUE pRegQueue = NULL; |
18 | u16 UrbSize; | 18 | u16 UrbSize; |
19 | struct usb_ctrlrequest *dr; | 19 | struct usb_ctrlrequest *dr; |
@@ -26,8 +26,8 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N | |||
26 | // Trying to use burst write function if use new hardware | 26 | // Trying to use burst write function if use new hardware |
27 | UrbSize = sizeof(REG_QUEUE) + DataSize + sizeof(struct usb_ctrlrequest); | 27 | UrbSize = sizeof(REG_QUEUE) + DataSize + sizeof(struct usb_ctrlrequest); |
28 | OS_MEMORY_ALLOC( (void* *)&pRegQueue, UrbSize ); | 28 | OS_MEMORY_ALLOC( (void* *)&pRegQueue, UrbSize ); |
29 | pUrb = wb_usb_alloc_urb(0); | 29 | urb = wb_usb_alloc_urb(0); |
30 | if( pUrb && pRegQueue ) { | 30 | if( urb && pRegQueue ) { |
31 | pRegQueue->DIRECT = 2;// burst write register | 31 | pRegQueue->DIRECT = 2;// burst write register |
32 | pRegQueue->INDEX = RegisterNo; | 32 | pRegQueue->INDEX = RegisterNo; |
33 | pRegQueue->pBuffer = (u32 *)((u8 *)pRegQueue + sizeof(REG_QUEUE)); | 33 | pRegQueue->pBuffer = (u32 *)((u8 *)pRegQueue + sizeof(REG_QUEUE)); |
@@ -44,7 +44,7 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N | |||
44 | dr->wLength = cpu_to_le16( DataSize ); | 44 | dr->wLength = cpu_to_le16( DataSize ); |
45 | pRegQueue->Next = NULL; | 45 | pRegQueue->Next = NULL; |
46 | pRegQueue->pUsbReq = dr; | 46 | pRegQueue->pUsbReq = dr; |
47 | pRegQueue->pUrb = pUrb; | 47 | pRegQueue->urb = urb; |
48 | 48 | ||
49 | spin_lock_irq( &pWb35Reg->EP0VM_spin_lock ); | 49 | spin_lock_irq( &pWb35Reg->EP0VM_spin_lock ); |
50 | if (pWb35Reg->pRegFirst == NULL) | 50 | if (pWb35Reg->pRegFirst == NULL) |
@@ -60,8 +60,8 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N | |||
60 | 60 | ||
61 | return TRUE; | 61 | return TRUE; |
62 | } else { | 62 | } else { |
63 | if (pUrb) | 63 | if (urb) |
64 | usb_free_urb(pUrb); | 64 | usb_free_urb(urb); |
65 | if (pRegQueue) | 65 | if (pRegQueue) |
66 | kfree(pRegQueue); | 66 | kfree(pRegQueue); |
67 | return FALSE; | 67 | return FALSE; |
@@ -163,7 +163,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) | |||
163 | { | 163 | { |
164 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 164 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
165 | struct usb_ctrlrequest *dr; | 165 | struct usb_ctrlrequest *dr; |
166 | PURB pUrb = NULL; | 166 | struct urb *urb = NULL; |
167 | PREG_QUEUE pRegQueue = NULL; | 167 | PREG_QUEUE pRegQueue = NULL; |
168 | u16 UrbSize; | 168 | u16 UrbSize; |
169 | 169 | ||
@@ -175,8 +175,8 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) | |||
175 | // update the register by send urb request------------------------------------ | 175 | // update the register by send urb request------------------------------------ |
176 | UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest); | 176 | UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest); |
177 | OS_MEMORY_ALLOC( (void* *)&pRegQueue, UrbSize ); | 177 | OS_MEMORY_ALLOC( (void* *)&pRegQueue, UrbSize ); |
178 | pUrb = wb_usb_alloc_urb(0); | 178 | urb = wb_usb_alloc_urb(0); |
179 | if (pUrb && pRegQueue) { | 179 | if (urb && pRegQueue) { |
180 | pRegQueue->DIRECT = 1;// burst write register | 180 | pRegQueue->DIRECT = 1;// burst write register |
181 | pRegQueue->INDEX = RegisterNo; | 181 | pRegQueue->INDEX = RegisterNo; |
182 | pRegQueue->VALUE = cpu_to_le32(RegisterValue); | 182 | pRegQueue->VALUE = cpu_to_le32(RegisterValue); |
@@ -191,7 +191,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) | |||
191 | // Enter the sending queue | 191 | // Enter the sending queue |
192 | pRegQueue->Next = NULL; | 192 | pRegQueue->Next = NULL; |
193 | pRegQueue->pUsbReq = dr; | 193 | pRegQueue->pUsbReq = dr; |
194 | pRegQueue->pUrb = pUrb; | 194 | pRegQueue->urb = urb; |
195 | 195 | ||
196 | spin_lock_irq(&pWb35Reg->EP0VM_spin_lock ); | 196 | spin_lock_irq(&pWb35Reg->EP0VM_spin_lock ); |
197 | if (pWb35Reg->pRegFirst == NULL) | 197 | if (pWb35Reg->pRegFirst == NULL) |
@@ -207,8 +207,8 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) | |||
207 | 207 | ||
208 | return TRUE; | 208 | return TRUE; |
209 | } else { | 209 | } else { |
210 | if (pUrb) | 210 | if (urb) |
211 | usb_free_urb(pUrb); | 211 | usb_free_urb(urb); |
212 | kfree(pRegQueue); | 212 | kfree(pRegQueue); |
213 | return FALSE; | 213 | return FALSE; |
214 | } | 214 | } |
@@ -224,7 +224,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register | |||
224 | { | 224 | { |
225 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 225 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
226 | struct usb_ctrlrequest *dr; | 226 | struct usb_ctrlrequest *dr; |
227 | PURB pUrb = NULL; | 227 | struct urb *urb = NULL; |
228 | PREG_QUEUE pRegQueue = NULL; | 228 | PREG_QUEUE pRegQueue = NULL; |
229 | u16 UrbSize; | 229 | u16 UrbSize; |
230 | 230 | ||
@@ -235,8 +235,8 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register | |||
235 | // update the register by send urb request------------------------------------ | 235 | // update the register by send urb request------------------------------------ |
236 | UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest); | 236 | UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest); |
237 | OS_MEMORY_ALLOC((void* *) &pRegQueue, UrbSize ); | 237 | OS_MEMORY_ALLOC((void* *) &pRegQueue, UrbSize ); |
238 | pUrb = wb_usb_alloc_urb(0); | 238 | urb = wb_usb_alloc_urb(0); |
239 | if (pUrb && pRegQueue) { | 239 | if (urb && pRegQueue) { |
240 | pRegQueue->DIRECT = 1;// burst write register | 240 | pRegQueue->DIRECT = 1;// burst write register |
241 | pRegQueue->INDEX = RegisterNo; | 241 | pRegQueue->INDEX = RegisterNo; |
242 | pRegQueue->VALUE = cpu_to_le32(RegisterValue); | 242 | pRegQueue->VALUE = cpu_to_le32(RegisterValue); |
@@ -253,7 +253,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register | |||
253 | // Enter the sending queue | 253 | // Enter the sending queue |
254 | pRegQueue->Next = NULL; | 254 | pRegQueue->Next = NULL; |
255 | pRegQueue->pUsbReq = dr; | 255 | pRegQueue->pUsbReq = dr; |
256 | pRegQueue->pUrb = pUrb; | 256 | pRegQueue->urb = urb; |
257 | spin_lock_irq (&pWb35Reg->EP0VM_spin_lock ); | 257 | spin_lock_irq (&pWb35Reg->EP0VM_spin_lock ); |
258 | if( pWb35Reg->pRegFirst == NULL ) | 258 | if( pWb35Reg->pRegFirst == NULL ) |
259 | pWb35Reg->pRegFirst = pRegQueue; | 259 | pWb35Reg->pRegFirst = pRegQueue; |
@@ -267,8 +267,8 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register | |||
267 | Wb35Reg_EP0VM_start(pHwData); | 267 | Wb35Reg_EP0VM_start(pHwData); |
268 | return TRUE; | 268 | return TRUE; |
269 | } else { | 269 | } else { |
270 | if (pUrb) | 270 | if (urb) |
271 | usb_free_urb(pUrb); | 271 | usb_free_urb(urb); |
272 | kfree(pRegQueue); | 272 | kfree(pRegQueue); |
273 | return FALSE; | 273 | return FALSE; |
274 | } | 274 | } |
@@ -331,7 +331,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) | |||
331 | { | 331 | { |
332 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 332 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
333 | struct usb_ctrlrequest * dr; | 333 | struct usb_ctrlrequest * dr; |
334 | PURB pUrb; | 334 | struct urb *urb; |
335 | PREG_QUEUE pRegQueue; | 335 | PREG_QUEUE pRegQueue; |
336 | u16 UrbSize; | 336 | u16 UrbSize; |
337 | 337 | ||
@@ -342,8 +342,8 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) | |||
342 | // update the variable by send Urb to read register ------------------------------------ | 342 | // update the variable by send Urb to read register ------------------------------------ |
343 | UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest); | 343 | UrbSize = sizeof(REG_QUEUE) + sizeof(struct usb_ctrlrequest); |
344 | OS_MEMORY_ALLOC( (void* *)&pRegQueue, UrbSize ); | 344 | OS_MEMORY_ALLOC( (void* *)&pRegQueue, UrbSize ); |
345 | pUrb = wb_usb_alloc_urb(0); | 345 | urb = wb_usb_alloc_urb(0); |
346 | if( pUrb && pRegQueue ) | 346 | if( urb && pRegQueue ) |
347 | { | 347 | { |
348 | pRegQueue->DIRECT = 0;// read register | 348 | pRegQueue->DIRECT = 0;// read register |
349 | pRegQueue->INDEX = RegisterNo; | 349 | pRegQueue->INDEX = RegisterNo; |
@@ -358,7 +358,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) | |||
358 | // Enter the sending queue | 358 | // Enter the sending queue |
359 | pRegQueue->Next = NULL; | 359 | pRegQueue->Next = NULL; |
360 | pRegQueue->pUsbReq = dr; | 360 | pRegQueue->pUsbReq = dr; |
361 | pRegQueue->pUrb = pUrb; | 361 | pRegQueue->urb = urb; |
362 | spin_lock_irq ( &pWb35Reg->EP0VM_spin_lock ); | 362 | spin_lock_irq ( &pWb35Reg->EP0VM_spin_lock ); |
363 | if( pWb35Reg->pRegFirst == NULL ) | 363 | if( pWb35Reg->pRegFirst == NULL ) |
364 | pWb35Reg->pRegFirst = pRegQueue; | 364 | pWb35Reg->pRegFirst = pRegQueue; |
@@ -373,8 +373,8 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) | |||
373 | 373 | ||
374 | return TRUE; | 374 | return TRUE; |
375 | } else { | 375 | } else { |
376 | if (pUrb) | 376 | if (urb) |
377 | usb_free_urb( pUrb ); | 377 | usb_free_urb( urb ); |
378 | kfree(pRegQueue); | 378 | kfree(pRegQueue); |
379 | return FALSE; | 379 | return FALSE; |
380 | } | 380 | } |
@@ -397,7 +397,7 @@ void | |||
397 | Wb35Reg_EP0VM(phw_data_t pHwData ) | 397 | Wb35Reg_EP0VM(phw_data_t pHwData ) |
398 | { | 398 | { |
399 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 399 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
400 | PURB pUrb; | 400 | struct urb *urb; |
401 | struct usb_ctrlrequest *dr; | 401 | struct usb_ctrlrequest *dr; |
402 | u32 * pBuffer; | 402 | u32 * pBuffer; |
403 | int ret = -1; | 403 | int ret = -1; |
@@ -419,22 +419,22 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) | |||
419 | goto cleanup; | 419 | goto cleanup; |
420 | 420 | ||
421 | // Get an Urb, send it | 421 | // Get an Urb, send it |
422 | pUrb = (PURB)pRegQueue->pUrb; | 422 | urb = (struct urb *)pRegQueue->urb; |
423 | 423 | ||
424 | dr = pRegQueue->pUsbReq; | 424 | dr = pRegQueue->pUsbReq; |
425 | pUrb = pRegQueue->pUrb; | 425 | urb = pRegQueue->urb; |
426 | pBuffer = pRegQueue->pBuffer; | 426 | pBuffer = pRegQueue->pBuffer; |
427 | if (pRegQueue->DIRECT == 1) // output | 427 | if (pRegQueue->DIRECT == 1) // output |
428 | pBuffer = &pRegQueue->VALUE; | 428 | pBuffer = &pRegQueue->VALUE; |
429 | 429 | ||
430 | usb_fill_control_urb( pUrb, pHwData->WbUsb.udev, | 430 | usb_fill_control_urb( urb, pHwData->WbUsb.udev, |
431 | REG_DIRECTION(pHwData->WbUsb.udev,pRegQueue), | 431 | REG_DIRECTION(pHwData->WbUsb.udev,pRegQueue), |
432 | (u8 *)dr,pBuffer,cpu_to_le16(dr->wLength), | 432 | (u8 *)dr,pBuffer,cpu_to_le16(dr->wLength), |
433 | Wb35Reg_EP0VM_complete, (void*)pHwData); | 433 | Wb35Reg_EP0VM_complete, (void*)pHwData); |
434 | 434 | ||
435 | pWb35Reg->EP0vm_state = VM_RUNNING; | 435 | pWb35Reg->EP0vm_state = VM_RUNNING; |
436 | 436 | ||
437 | ret = wb_usb_submit_urb( pUrb ); | 437 | ret = wb_usb_submit_urb( urb ); |
438 | 438 | ||
439 | if (ret < 0) { | 439 | if (ret < 0) { |
440 | #ifdef _PE_REG_DUMP_ | 440 | #ifdef _PE_REG_DUMP_ |
@@ -452,16 +452,16 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) | |||
452 | 452 | ||
453 | 453 | ||
454 | void | 454 | void |
455 | Wb35Reg_EP0VM_complete(PURB pUrb) | 455 | Wb35Reg_EP0VM_complete(struct urb *urb) |
456 | { | 456 | { |
457 | phw_data_t pHwData = (phw_data_t)pUrb->context; | 457 | phw_data_t pHwData = (phw_data_t)urb->context; |
458 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 458 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
459 | PREG_QUEUE pRegQueue; | 459 | PREG_QUEUE pRegQueue; |
460 | 460 | ||
461 | 461 | ||
462 | // Variable setting | 462 | // Variable setting |
463 | pWb35Reg->EP0vm_state = VM_COMPLETED; | 463 | pWb35Reg->EP0vm_state = VM_COMPLETED; |
464 | pWb35Reg->EP0VM_status = pUrb->status; | 464 | pWb35Reg->EP0VM_status = urb->status; |
465 | 465 | ||
466 | if (pHwData->SurpriseRemove) { // Let WbWlanHalt to handle surprise remove | 466 | if (pHwData->SurpriseRemove) { // Let WbWlanHalt to handle surprise remove |
467 | pWb35Reg->EP0vm_state = VM_STOP; | 467 | pWb35Reg->EP0vm_state = VM_STOP; |
@@ -492,7 +492,7 @@ Wb35Reg_EP0VM_complete(PURB pUrb) | |||
492 | kfree(pRegQueue); | 492 | kfree(pRegQueue); |
493 | } | 493 | } |
494 | 494 | ||
495 | usb_free_urb(pUrb); | 495 | usb_free_urb(urb); |
496 | } | 496 | } |
497 | 497 | ||
498 | 498 | ||
@@ -500,7 +500,7 @@ void | |||
500 | Wb35Reg_destroy(phw_data_t pHwData) | 500 | Wb35Reg_destroy(phw_data_t pHwData) |
501 | { | 501 | { |
502 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; | 502 | PWB35REG pWb35Reg = &pHwData->Wb35Reg; |
503 | PURB pUrb; | 503 | struct urb *urb; |
504 | PREG_QUEUE pRegQueue; | 504 | PREG_QUEUE pRegQueue; |
505 | 505 | ||
506 | 506 | ||
@@ -520,10 +520,10 @@ Wb35Reg_destroy(phw_data_t pHwData) | |||
520 | pWb35Reg->pRegLast = NULL; | 520 | pWb35Reg->pRegLast = NULL; |
521 | pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next; | 521 | pWb35Reg->pRegFirst = pWb35Reg->pRegFirst->Next; |
522 | 522 | ||
523 | pUrb = pRegQueue->pUrb; | 523 | urb = pRegQueue->urb; |
524 | spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock ); | 524 | spin_unlock_irq( &pWb35Reg->EP0VM_spin_lock ); |
525 | if (pUrb) { | 525 | if (urb) { |
526 | usb_free_urb(pUrb); | 526 | usb_free_urb(urb); |
527 | kfree(pRegQueue); | 527 | kfree(pRegQueue); |
528 | } else { | 528 | } else { |
529 | #ifdef _PE_REG_DUMP_ | 529 | #ifdef _PE_REG_DUMP_ |
diff --git a/drivers/staging/winbond/linux/wb35reg_f.h b/drivers/staging/winbond/linux/wb35reg_f.h index 3006cfe99cc..fc940914e34 100644 --- a/drivers/staging/winbond/linux/wb35reg_f.h +++ b/drivers/staging/winbond/linux/wb35reg_f.h | |||
@@ -42,7 +42,7 @@ unsigned char Wb35Reg_BurstWrite( phw_data_t pHwData, u16 RegisterNo, u32 * p | |||
42 | 42 | ||
43 | void Wb35Reg_EP0VM( phw_data_t pHwData ); | 43 | void Wb35Reg_EP0VM( phw_data_t pHwData ); |
44 | void Wb35Reg_EP0VM_start( phw_data_t pHwData ); | 44 | void Wb35Reg_EP0VM_start( phw_data_t pHwData ); |
45 | void Wb35Reg_EP0VM_complete( PURB pUrb ); | 45 | void Wb35Reg_EP0VM_complete(struct urb *urb); |
46 | 46 | ||
47 | u32 BitReverse( u32 dwData, u32 DataLength); | 47 | u32 BitReverse( u32 dwData, u32 DataLength); |
48 | 48 | ||
diff --git a/drivers/staging/winbond/linux/wb35reg_s.h b/drivers/staging/winbond/linux/wb35reg_s.h index 8b35b93f7f0..c633b92c380 100644 --- a/drivers/staging/winbond/linux/wb35reg_s.h +++ b/drivers/staging/winbond/linux/wb35reg_s.h | |||
@@ -69,7 +69,7 @@ | |||
69 | 69 | ||
70 | typedef struct _REG_QUEUE | 70 | typedef struct _REG_QUEUE |
71 | { | 71 | { |
72 | struct urb *pUrb; | 72 | struct urb *urb; |
73 | void* pUsbReq; | 73 | void* pUsbReq; |
74 | void* Next; | 74 | void* Next; |
75 | union | 75 | union |
diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c index 545c6107091..24ef23e2d71 100644 --- a/drivers/staging/winbond/linux/wb35rx.c +++ b/drivers/staging/winbond/linux/wb35rx.c | |||
@@ -28,7 +28,7 @@ void Wb35Rx( phw_data_t pHwData ) | |||
28 | { | 28 | { |
29 | PWB35RX pWb35Rx = &pHwData->Wb35Rx; | 29 | PWB35RX pWb35Rx = &pHwData->Wb35Rx; |
30 | u8 * pRxBufferAddress; | 30 | u8 * pRxBufferAddress; |
31 | PURB pUrb = (PURB)pWb35Rx->RxUrb; | 31 | struct urb *urb = pWb35Rx->RxUrb; |
32 | int retv; | 32 | int retv; |
33 | u32 RxBufferId; | 33 | u32 RxBufferId; |
34 | 34 | ||
@@ -63,14 +63,14 @@ void Wb35Rx( phw_data_t pHwData ) | |||
63 | } | 63 | } |
64 | pRxBufferAddress = pWb35Rx->pDRx; | 64 | pRxBufferAddress = pWb35Rx->pDRx; |
65 | 65 | ||
66 | usb_fill_bulk_urb(pUrb, pHwData->WbUsb.udev, | 66 | usb_fill_bulk_urb(urb, pHwData->WbUsb.udev, |
67 | usb_rcvbulkpipe(pHwData->WbUsb.udev, 3), | 67 | usb_rcvbulkpipe(pHwData->WbUsb.udev, 3), |
68 | pRxBufferAddress, MAX_USB_RX_BUFFER, | 68 | pRxBufferAddress, MAX_USB_RX_BUFFER, |
69 | Wb35Rx_Complete, pHwData); | 69 | Wb35Rx_Complete, pHwData); |
70 | 70 | ||
71 | pWb35Rx->EP3vm_state = VM_RUNNING; | 71 | pWb35Rx->EP3vm_state = VM_RUNNING; |
72 | 72 | ||
73 | retv = wb_usb_submit_urb(pUrb); | 73 | retv = wb_usb_submit_urb(urb); |
74 | 74 | ||
75 | if (retv != 0) { | 75 | if (retv != 0) { |
76 | printk("Rx URB sending error\n"); | 76 | printk("Rx URB sending error\n"); |
@@ -84,9 +84,9 @@ error: | |||
84 | OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Rx->RxFireCounter ); | 84 | OS_ATOMIC_DEC( pHwData->Adapter, &pWb35Rx->RxFireCounter ); |
85 | } | 85 | } |
86 | 86 | ||
87 | void Wb35Rx_Complete(PURB pUrb) | 87 | void Wb35Rx_Complete(struct urb *urb) |
88 | { | 88 | { |
89 | phw_data_t pHwData = pUrb->context; | 89 | phw_data_t pHwData = urb->context; |
90 | PWB35RX pWb35Rx = &pHwData->Wb35Rx; | 90 | PWB35RX pWb35Rx = &pHwData->Wb35Rx; |
91 | u8 * pRxBufferAddress; | 91 | u8 * pRxBufferAddress; |
92 | u32 SizeCheck; | 92 | u32 SizeCheck; |
@@ -96,12 +96,12 @@ void Wb35Rx_Complete(PURB pUrb) | |||
96 | 96 | ||
97 | // Variable setting | 97 | // Variable setting |
98 | pWb35Rx->EP3vm_state = VM_COMPLETED; | 98 | pWb35Rx->EP3vm_state = VM_COMPLETED; |
99 | pWb35Rx->EP3VM_status = pUrb->status;//Store the last result of Irp | 99 | pWb35Rx->EP3VM_status = urb->status;//Store the last result of Irp |
100 | 100 | ||
101 | RxBufferId = pWb35Rx->CurrentRxBufferId; | 101 | RxBufferId = pWb35Rx->CurrentRxBufferId; |
102 | 102 | ||
103 | pRxBufferAddress = pWb35Rx->pDRx; | 103 | pRxBufferAddress = pWb35Rx->pDRx; |
104 | BulkLength = (u16)pUrb->actual_length; | 104 | BulkLength = (u16)urb->actual_length; |
105 | 105 | ||
106 | // The IRP is completed | 106 | // The IRP is completed |
107 | pWb35Rx->EP3vm_state = VM_COMPLETED; | 107 | pWb35Rx->EP3vm_state = VM_COMPLETED; |
diff --git a/drivers/staging/winbond/linux/wb35rx_f.h b/drivers/staging/winbond/linux/wb35rx_f.h index daa3e73042b..565280e890b 100644 --- a/drivers/staging/winbond/linux/wb35rx_f.h +++ b/drivers/staging/winbond/linux/wb35rx_f.h | |||
@@ -10,7 +10,7 @@ void Wb35Rx_adjust( PDESCRIPTOR pRxDes ); | |||
10 | void Wb35Rx_start( phw_data_t pHwData ); | 10 | void Wb35Rx_start( phw_data_t pHwData ); |
11 | 11 | ||
12 | void Wb35Rx( phw_data_t pHwData ); | 12 | void Wb35Rx( phw_data_t pHwData ); |
13 | void Wb35Rx_Complete( PURB pUrb ); | 13 | void Wb35Rx_Complete(struct urb *urb); |
14 | 14 | ||
15 | 15 | ||
16 | 16 | ||
diff --git a/drivers/staging/winbond/linux/wb35tx_f.h b/drivers/staging/winbond/linux/wb35tx_f.h index 107b1291813..1815c10b081 100644 --- a/drivers/staging/winbond/linux/wb35tx_f.h +++ b/drivers/staging/winbond/linux/wb35tx_f.h | |||
@@ -7,12 +7,12 @@ unsigned char Wb35Tx_get_tx_buffer( phw_data_t pHwData, u8 **pBuffer ); | |||
7 | 7 | ||
8 | void Wb35Tx_EP2VM( phw_data_t pHwData ); | 8 | void Wb35Tx_EP2VM( phw_data_t pHwData ); |
9 | void Wb35Tx_EP2VM_start( phw_data_t pHwData ); | 9 | void Wb35Tx_EP2VM_start( phw_data_t pHwData ); |
10 | void Wb35Tx_EP2VM_complete( PURB purb ); | 10 | void Wb35Tx_EP2VM_complete(struct urb *urb); |
11 | 11 | ||
12 | void Wb35Tx_start( phw_data_t pHwData ); | 12 | void Wb35Tx_start( phw_data_t pHwData ); |
13 | void Wb35Tx_stop( phw_data_t pHwData ); | 13 | void Wb35Tx_stop( phw_data_t pHwData ); |
14 | void Wb35Tx( phw_data_t pHwData ); | 14 | void Wb35Tx( phw_data_t pHwData ); |
15 | void Wb35Tx_complete( PURB purb ); | 15 | void Wb35Tx_complete(struct urb *urb); |
16 | void Wb35Tx_reset_descriptor( phw_data_t pHwData ); | 16 | void Wb35Tx_reset_descriptor( phw_data_t pHwData ); |
17 | 17 | ||
18 | void Wb35Tx_CurrentTime( phw_data_t pHwData, u32 TimeCount ); | 18 | void Wb35Tx_CurrentTime( phw_data_t pHwData, u32 TimeCount ); |
diff --git a/drivers/staging/winbond/linux/wbusb_s.h b/drivers/staging/winbond/linux/wbusb_s.h index b7fc7220ebd..45e41b37194 100644 --- a/drivers/staging/winbond/linux/wbusb_s.h +++ b/drivers/staging/winbond/linux/wbusb_s.h | |||
@@ -19,7 +19,7 @@ | |||
19 | typedef struct _RW_CONTEXT | 19 | typedef struct _RW_CONTEXT |
20 | { | 20 | { |
21 | void* pHwData; | 21 | void* pHwData; |
22 | PURB pUrb; | 22 | struct urb *urb; |
23 | void* pCallBackFunctionParameter; | 23 | void* pCallBackFunctionParameter; |
24 | } RW_CONTEXT, *PRW_CONTEXT; | 24 | } RW_CONTEXT, *PRW_CONTEXT; |
25 | 25 | ||