diff options
Diffstat (limited to 'drivers/staging/winbond/linux/wb35rx.c')
-rw-r--r-- | drivers/staging/winbond/linux/wb35rx.c | 14 |
1 files changed, 7 insertions, 7 deletions
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; |