This patch removes typedef for _USB_RCB, changes the name of the struct to bcm_usb_rcb. In addition, any calls to typedefs USB_RCB, or *PUSB_RCB are changed to call the struct directly.
Signed-off-by: Kevin McKinney <[email protected]> --- drivers/staging/bcm/InterfaceAdapter.h | 6 +++--- drivers/staging/bcm/InterfaceRx.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h index 79139d9..1955c92 100644 --- a/drivers/staging/bcm/InterfaceAdapter.h +++ b/drivers/staging/bcm/InterfaceAdapter.h @@ -40,11 +40,11 @@ typedef struct _USB_TCB { bool bUsed; } USB_TCB, *PUSB_TCB; -typedef struct _USB_RCB { +struct bcm_usb_rcb { struct urb *urb; void *psIntfAdapter; bool bUsed; -} USB_RCB, *PUSB_RCB; +}; /* * This is the interface specific Sub-Adapter @@ -64,7 +64,7 @@ struct bcm_interface_adapter { ULONG ulInterruptData[2]; struct urb *psInterruptUrb; USB_TCB asUsbTcb[MAXIMUM_USB_TCB]; - USB_RCB asUsbRcb[MAXIMUM_USB_RCB]; + struct bcm_usb_rcb asUsbRcb[MAXIMUM_USB_RCB]; atomic_t uNumTcbUsed; atomic_t uCurrTcb; atomic_t uNumRcbUsed; diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c index 74b6a3f..26f5bc7 100644 --- a/drivers/staging/bcm/InterfaceRx.c +++ b/drivers/staging/bcm/InterfaceRx.c @@ -12,10 +12,10 @@ static int SearchVcid(struct bcm_mini_adapter *Adapter,unsigned short usVcid) } -static PUSB_RCB +static struct bcm_usb_rcb * GetBulkInRcb(struct bcm_interface_adapter *psIntfAdapter) { - PUSB_RCB pRcb = NULL; + struct bcm_usb_rcb *pRcb = NULL; UINT index = 0; if((atomic_read(&psIntfAdapter->uNumRcbUsed) < MAXIMUM_USB_RCB) && @@ -43,7 +43,7 @@ static void read_bulk_callback(struct urb *urb) UINT uiIndex=0; int process_done = 1; //int idleflag = 0 ; - PUSB_RCB pRcb = (PUSB_RCB)urb->context; + struct bcm_usb_rcb *pRcb = (struct bcm_usb_rcb *)urb->context; struct bcm_interface_adapter *psIntfAdapter = pRcb->psIntfAdapter; struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter; struct bcm_leader *pLeader = urb->transfer_buffer; @@ -196,7 +196,7 @@ static void read_bulk_callback(struct urb *urb) atomic_dec(&psIntfAdapter->uNumRcbUsed); } -static int ReceiveRcb(struct bcm_interface_adapter *psIntfAdapter, PUSB_RCB pRcb) +static int ReceiveRcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_usb_rcb *pRcb) { struct urb *urb = pRcb->urb; int retval = 0; @@ -243,7 +243,7 @@ Return: TRUE - If Rx was successful. BOOLEAN InterfaceRx (struct bcm_interface_adapter *psIntfAdapter) { USHORT RxDescCount = NUM_RX_DESC - atomic_read(&psIntfAdapter->uNumRcbUsed); - PUSB_RCB pRcb = NULL; + struct bcm_usb_rcb *pRcb = NULL; // RxDescCount = psIntfAdapter->psAdapter->CurrNumRecvDescs - // psIntfAdapter->psAdapter->PrevNumRecvDescs; -- 1.7.9.5 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
