Staging: bcm: Remove typedef for _USB_RCB and call directly.

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 <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/InterfaceAdapter.h b/drivers/staging/bcm/InterfaceAdapter.h
index 79139d96a40375183e62a167894500bd5d49e9ee..1955c924be4b295b65f6489a74180181df4618d6 100644 (file)
--- 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 74b6a3f3fb61f9c0cf4e293e7b4a5caf4286c426..26f5bc76111c59574d41870d384fd82f039e423a 100644 (file)
--- 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;