- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / rt2870 / common / rtusb_bulk.c

diff --git a/drivers/staging/rt2870/common/rtusb_bulk.c b/drivers/staging/rt2870/common/rtusb_bulk.c
index 379780c..d2746f8 100644 (file)
--- a/drivers/staging/rt2870/common/rtusb_bulk.c
+++ b/drivers/staging/rt2870/common/rtusb_bulk.c
@@ -172,11 +172,11 @@ void RTUSBInitRxDesc(struct rt_rtmp_adapter *pAd, struct rt_rx_context *pRxConte
 */
 
 #define BULK_OUT_LOCK(pLock, IrqFlags) \
-               if(1 /*!(in_interrupt() & 0xffff0000)*/)        \
+               if (1 /*!(in_interrupt() & 0xffff0000)*/)       \
                        RTMP_IRQ_LOCK((pLock), IrqFlags);
 
 #define BULK_OUT_UNLOCK(pLock, IrqFlags)       \
-               if(1 /*!(in_interrupt() & 0xffff0000)*/)        \
+               if (1 /*!(in_interrupt() & 0xffff0000)*/)       \
                        RTMP_IRQ_UNLOCK((pLock), IrqFlags);
 
 void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
@@ -187,7 +187,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
        PURB pUrb;
        int ret = 0;
        struct rt_txinfo *pTxInfo, *pLastTxInfo = NULL;
-       struct rt_txwi * pTxWI;
+       struct rt_txwi *pTxWI;
        unsigned long TmpBulkEndPos, ThisBulkSize;
        unsigned long IrqFlags = 0, IrqFlags2 = 0;
        u8 *pWirelessPkt, *pAppendant;
@@ -273,9 +273,9 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
        }
 
        do {
-               pTxInfo = (struct rt_txinfo *)& pWirelessPkt[TmpBulkEndPos];
+               pTxInfo = (struct rt_txinfo *)&pWirelessPkt[TmpBulkEndPos];
                pTxWI =
-                   (struct rt_txwi *) & pWirelessPkt[TmpBulkEndPos + TXINFO_SIZE];
+                       (struct rt_txwi *)&pWirelessPkt[TmpBulkEndPos + TXINFO_SIZE];
 
                if (pAd->bForcePrintTX == TRUE)
                        DBGPRINT(RT_DEBUG_TRACE,
@@ -310,7 +310,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
                                pHTTXContext->ENextBulkOutPosition =
                                    TmpBulkEndPos;
                                break;
-                       } else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize & 0xfffff800) != 0)) /*|| ( (ThisBulkSize != 0)  && (pTxWI->AMPDU == 0)) */ ) { /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */
+                       } else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize & 0xfffff800) != 0)) /*|| ( (ThisBulkSize != 0)  && (pTxWI->AMPDU == 0)) */) {  /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */
                                /* For performence in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */
                                pHTTXContext->ENextBulkOutPosition =
                                    TmpBulkEndPos;
@@ -326,7 +326,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
                if (pTxInfo->QSEL != FIFO_EDCA) {
                        DBGPRINT(RT_DEBUG_ERROR,
                                 ("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n",
-                                 __FUNCTION__, pTxInfo->QSEL));
+                                 __func__, pTxInfo->QSEL));
                        DBGPRINT(RT_DEBUG_ERROR,
                                 ("\tCWPos=%ld, NBPos=%ld, ENBPos=%ld, bCopy=%d!\n",
                                  pHTTXContext->CurWritePosition,
@@ -334,7 +334,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
                                  pHTTXContext->ENextBulkOutPosition,
                                  pHTTXContext->bCopySavePad));
                        hex_dump("Wrong QSel Pkt:",
-                                (u8 *)& pWirelessPkt[TmpBulkEndPos],
+                                (u8 *)&pWirelessPkt[TmpBulkEndPos],
                                 (pHTTXContext->CurWritePosition -
                                  pHTTXContext->NextBulkOutPosition));
                }
@@ -401,9 +401,8 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
        } while (TRUE);
 
        /* adjust the pTxInfo->USBDMANextVLD value of last pTxInfo. */
-       if (pLastTxInfo) {
+       if (pLastTxInfo)
                pLastTxInfo->USBDMANextVLD = 0;
-       }
 
        /*
           We need to copy SavedPad when following condition matched!
@@ -475,7 +474,8 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
                          (usb_complete_t) RTUSBBulkOutDataPacketComplete);
 
        pUrb = pHTTXContext->pUrb;
-       if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
+       ret = RTUSB_SUBMIT_URB(pUrb);
+       if (ret != 0) {
                DBGPRINT(RT_DEBUG_ERROR,
                         ("RTUSBBulkOutDataPacket: Submit Tx URB failed %d\n",
                          ret));
@@ -573,7 +573,8 @@ void RTUSBBulkOutNullFrame(struct rt_rtmp_adapter *pAd)
                        (usb_complete_t) RTUSBBulkOutNullFrameComplete);
 
        pUrb = pNullContext->pUrb;
-       if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
+       ret = RTUSB_SUBMIT_URB(pUrb);
+       if (ret != 0) {
                RTMP_IRQ_LOCK(&pAd->BulkOutLock[0], IrqFlags);
                pAd->BulkOutPending[0] = FALSE;
                pAd->watchDogTxPendingCnt[0] = 0;
@@ -667,7 +668,8 @@ void RTUSBBulkOutMLMEPacket(struct rt_rtmp_adapter *pAd, u8 Index)
        pUrb->transfer_flags &= (~URB_NO_TRANSFER_DMA_MAP);
 
        pUrb = pMLMEContext->pUrb;
-       if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
+       ret = RTUSB_SUBMIT_URB(pUrb);
+       if (ret != 0) {
                DBGPRINT(RT_DEBUG_ERROR,
                         ("RTUSBBulkOutMLMEPacket: Submit MLME URB failed %d\n",
                          ret));
@@ -742,7 +744,8 @@ void RTUSBBulkOutPsPoll(struct rt_rtmp_adapter *pAd)
                        (usb_complete_t) RTUSBBulkOutPsPollComplete);
 
        pUrb = pPsPollContext->pUrb;
-       if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {
+       ret = RTUSB_SUBMIT_URB(pUrb);
+       if (ret != 0) {
                RTMP_IRQ_LOCK(&pAd->BulkOutLock[0], IrqFlags);
                pAd->BulkOutPending[0] = FALSE;
                pAd->watchDogTxPendingCnt[0] = 0;
@@ -799,7 +802,8 @@ void DoBulkIn(struct rt_rtmp_adapter *pAd)
        RTUSBInitRxDesc(pAd, pRxContext);
 
        pUrb = pRxContext->pUrb;
-       if ((ret = RTUSB_SUBMIT_URB(pUrb)) != 0) {      /* fail */
+       ret = RTUSB_SUBMIT_URB(pUrb);
+       if (ret != 0) { /* fail */
 
                RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags);
                pRxContext->InUse = FALSE;
@@ -949,9 +953,8 @@ void RTUSBKickBulkOut(struct rt_rtmp_adapter *pAd)
        if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NEED_STOP_TX)
            ) {
                /* 2. PS-Poll frame is next */
-               if (RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_PSPOLL)) {
+               if (RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_PSPOLL))
                        RTUSBBulkOutPsPoll(pAd);
-               }
                /* 5. Mlme frame is next */
                else if ((RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_MLME)) ||
                         (pAd->MgmtRing.TxSwFreeIdx < MGMT_RING_SIZE)) {
@@ -1014,9 +1017,8 @@ void RTUSBKickBulkOut(struct rt_rtmp_adapter *pAd)
                        }
                }
                /* 8. No data avaliable */
-               else {
-
-               }
+               else
+                       ;
        }
 }