mmc: omap_hsmmc: consolidate error report handling of HSMMC IRQ

[linux.git] / drivers / staging / bcm / InterfaceRx.c

diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index d495828a731fca8632f76ee67101e62c972e9f4c..8a9f90fbdf138d62e4997be92df483afe87729f4 100644 (file)
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -1,6 +1,6 @@
 #include "headers.h"
 
-static int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid)
+static int SearchVcid(struct bcm_mini_adapter *Adapter,unsigned short usVcid)
 {
        int iIndex=0;
 
@@ -45,8 +45,8 @@ static void read_bulk_callback(struct urb *urb)
        //int idleflag = 0 ;
        PUSB_RCB pRcb = (PUSB_RCB)urb->context;
        PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;
-       PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;
-       PLEADER pLeader = urb->transfer_buffer;
+       struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter;
+       struct bcm_leader *pLeader = urb->transfer_buffer;
 
        if (unlikely(netif_msg_rx_status(Adapter)))
                pr_info(PFX "%s: rx urb status %d length %d\n",
@@ -126,7 +126,7 @@ static void read_bulk_callback(struct urb *urb)
            BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");
                *(PUSHORT)skb->data = pLeader->Status;
                memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
-                       (sizeof(LEADER)), pLeader->PLength);
+                       (sizeof(struct bcm_leader)), pLeader->PLength);
                skb->len = pLeader->PLength + sizeof(USHORT);
 
                spin_lock(&Adapter->control_queue_lock);
@@ -144,7 +144,7 @@ static void read_bulk_callback(struct urb *urb)
                  */
         BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt...");
                skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);
-               memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength);
+               memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(struct bcm_leader), pLeader->PLength);
                skb->dev = Adapter->dev;
 
                /* currently skb->len has extra ETH_HLEN bytes in the beginning */
@@ -232,7 +232,7 @@ Function:                           InterfaceRx
 Description:                   This is the hardware specific Function for Receiving
                                                data packet/control packets from the device.
 
-Input parameters:              IN PMINI_ADAPTER Adapter   - Miniport Adapter Context
+Input parameters:              IN struct bcm_mini_adapter *Adapter   - Miniport Adapter Context