Staging: rt2870:: rtusb_bulk.c: Checkpatch cleanup
drivers/staging/rt2870/common/rtusb_bulk.c:45: ERROR: that open brace { should be on the previous line drivers/staging/rt2870/common/rtusb_bulk.c:175: ERROR: space required before the open parenthesis '(' drivers/staging/rt2870/common/rtusb_bulk.c:179: ERROR: space required before the open parenthesis '(' drivers/staging/rt2870/common/rtusb_bulk.c:190: ERROR: "foo * bar" should be "foo *bar" drivers/staging/rt2870/common/rtusb_bulk.c:276: ERROR: space prohibited after that '&' (ctx:VxW) drivers/staging/rt2870/common/rtusb_bulk.c:278: ERROR: space prohibited after that '&' (ctx:WxW) drivers/staging/rt2870/common/rtusb_bulk.c:313: ERROR: space prohibited before that close parenthesis ')' drivers/staging/rt2870/common/rtusb_bulk.c:329: WARNING: __func__ should be used instead of gcc specific __FUNCTION__ drivers/staging/rt2870/common/rtusb_bulk.c:337: ERROR: space prohibited after that '&' (ctx:VxW) drivers/staging/rt2870/common/rtusb_bulk.c:404: WARNING: braces {} are not necessary for single statement blocks drivers/staging/rt2870/common/rtusb_bulk.c:952: WARNING: braces {} are not necessary for single statement blocks drivers/staging/rt2870/common/rtusb_bulk.c:1017: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
2c300f2a65
Коммит
d24e449762
|
@ -172,11 +172,11 @@ void RTUSBInitRxDesc(struct rt_rtmp_adapter *pAd, struct rt_rx_context *pRxConte
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define BULK_OUT_LOCK(pLock, IrqFlags) \
|
#define BULK_OUT_LOCK(pLock, IrqFlags) \
|
||||||
if(1 /*!(in_interrupt() & 0xffff0000)*/) \
|
if (1 /*!(in_interrupt() & 0xffff0000)*/) \
|
||||||
RTMP_IRQ_LOCK((pLock), IrqFlags);
|
RTMP_IRQ_LOCK((pLock), IrqFlags);
|
||||||
|
|
||||||
#define BULK_OUT_UNLOCK(pLock, IrqFlags) \
|
#define BULK_OUT_UNLOCK(pLock, IrqFlags) \
|
||||||
if(1 /*!(in_interrupt() & 0xffff0000)*/) \
|
if (1 /*!(in_interrupt() & 0xffff0000)*/) \
|
||||||
RTMP_IRQ_UNLOCK((pLock), IrqFlags);
|
RTMP_IRQ_UNLOCK((pLock), IrqFlags);
|
||||||
|
|
||||||
void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
|
@ -187,7 +187,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
PURB pUrb;
|
PURB pUrb;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
struct rt_txinfo *pTxInfo, *pLastTxInfo = NULL;
|
struct rt_txinfo *pTxInfo, *pLastTxInfo = NULL;
|
||||||
struct rt_txwi * pTxWI;
|
struct rt_txwi *pTxWI;
|
||||||
unsigned long TmpBulkEndPos, ThisBulkSize;
|
unsigned long TmpBulkEndPos, ThisBulkSize;
|
||||||
unsigned long IrqFlags = 0, IrqFlags2 = 0;
|
unsigned long IrqFlags = 0, IrqFlags2 = 0;
|
||||||
u8 *pWirelessPkt, *pAppendant;
|
u8 *pWirelessPkt, *pAppendant;
|
||||||
|
@ -273,9 +273,9 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
pTxInfo = (struct rt_txinfo *)& pWirelessPkt[TmpBulkEndPos];
|
pTxInfo = (struct rt_txinfo *)&pWirelessPkt[TmpBulkEndPos];
|
||||||
pTxWI =
|
pTxWI =
|
||||||
(struct rt_txwi *) & pWirelessPkt[TmpBulkEndPos + TXINFO_SIZE];
|
(struct rt_txwi *)&pWirelessPkt[TmpBulkEndPos + TXINFO_SIZE];
|
||||||
|
|
||||||
if (pAd->bForcePrintTX == TRUE)
|
if (pAd->bForcePrintTX == TRUE)
|
||||||
DBGPRINT(RT_DEBUG_TRACE,
|
DBGPRINT(RT_DEBUG_TRACE,
|
||||||
|
@ -310,7 +310,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
pHTTXContext->ENextBulkOutPosition =
|
pHTTXContext->ENextBulkOutPosition =
|
||||||
TmpBulkEndPos;
|
TmpBulkEndPos;
|
||||||
break;
|
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. */
|
/* 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 =
|
pHTTXContext->ENextBulkOutPosition =
|
||||||
TmpBulkEndPos;
|
TmpBulkEndPos;
|
||||||
|
@ -326,7 +326,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
if (pTxInfo->QSEL != FIFO_EDCA) {
|
if (pTxInfo->QSEL != FIFO_EDCA) {
|
||||||
DBGPRINT(RT_DEBUG_ERROR,
|
DBGPRINT(RT_DEBUG_ERROR,
|
||||||
("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n",
|
("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n",
|
||||||
__FUNCTION__, pTxInfo->QSEL));
|
__func__, pTxInfo->QSEL));
|
||||||
DBGPRINT(RT_DEBUG_ERROR,
|
DBGPRINT(RT_DEBUG_ERROR,
|
||||||
("\tCWPos=%ld, NBPos=%ld, ENBPos=%ld, bCopy=%d!\n",
|
("\tCWPos=%ld, NBPos=%ld, ENBPos=%ld, bCopy=%d!\n",
|
||||||
pHTTXContext->CurWritePosition,
|
pHTTXContext->CurWritePosition,
|
||||||
|
@ -334,7 +334,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
pHTTXContext->ENextBulkOutPosition,
|
pHTTXContext->ENextBulkOutPosition,
|
||||||
pHTTXContext->bCopySavePad));
|
pHTTXContext->bCopySavePad));
|
||||||
hex_dump("Wrong QSel Pkt:",
|
hex_dump("Wrong QSel Pkt:",
|
||||||
(u8 *)& pWirelessPkt[TmpBulkEndPos],
|
(u8 *)&pWirelessPkt[TmpBulkEndPos],
|
||||||
(pHTTXContext->CurWritePosition -
|
(pHTTXContext->CurWritePosition -
|
||||||
pHTTXContext->NextBulkOutPosition));
|
pHTTXContext->NextBulkOutPosition));
|
||||||
}
|
}
|
||||||
|
@ -401,9 +401,8 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
|
||||||
} while (TRUE);
|
} while (TRUE);
|
||||||
|
|
||||||
/* adjust the pTxInfo->USBDMANextVLD value of last pTxInfo. */
|
/* adjust the pTxInfo->USBDMANextVLD value of last pTxInfo. */
|
||||||
if (pLastTxInfo) {
|
if (pLastTxInfo)
|
||||||
pLastTxInfo->USBDMANextVLD = 0;
|
pLastTxInfo->USBDMANextVLD = 0;
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
We need to copy SavedPad when following condition matched!
|
We need to copy SavedPad when following condition matched!
|
||||||
|
@ -949,9 +948,8 @@ void RTUSBKickBulkOut(struct rt_rtmp_adapter *pAd)
|
||||||
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NEED_STOP_TX)
|
if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NEED_STOP_TX)
|
||||||
) {
|
) {
|
||||||
/* 2. PS-Poll frame is next */
|
/* 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);
|
RTUSBBulkOutPsPoll(pAd);
|
||||||
}
|
|
||||||
/* 5. Mlme frame is next */
|
/* 5. Mlme frame is next */
|
||||||
else if ((RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_MLME)) ||
|
else if ((RTUSB_TEST_BULK_FLAG(pAd, fRTUSB_BULK_OUT_MLME)) ||
|
||||||
(pAd->MgmtRing.TxSwFreeIdx < MGMT_RING_SIZE)) {
|
(pAd->MgmtRing.TxSwFreeIdx < MGMT_RING_SIZE)) {
|
||||||
|
@ -1014,9 +1012,8 @@ void RTUSBKickBulkOut(struct rt_rtmp_adapter *pAd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* 8. No data avaliable */
|
/* 8. No data avaliable */
|
||||||
else {
|
else
|
||||||
|
;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче