Better spacing in for control loops. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> --- drivers/staging/bcm/CmHost.c | 55 ++++++++++++++++++----------------- drivers/staging/bcm/IPv6Protocol.c | 14 ++++---- drivers/staging/bcm/LeakyBucket.c | 6 ++-- drivers/staging/bcm/Misc.c | 2 +- drivers/staging/bcm/PHSModule.c | 28 +++++++++--------- drivers/staging/bcm/Qos.c | 24 ++++++++-------- drivers/staging/bcm/nvm.c | 24 ++++++++-------- 7 files changed, 77 insertions(+), 76 deletions(-) diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 8f09439..212ac4c 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -33,7 +33,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter,B_UINT16 tid); INT SearchSfid(PMINI_ADAPTER Adapter,UINT uiSfid) { INT iIndex=0; - for (iIndex=(NO_OF_QUEUES-1); iIndex>=0; iIndex--) + for (iIndex = (NO_OF_QUEUES - 1); iIndex >= 0; iIndex--) if (Adapter->PackInfo[iIndex].ulSFID==uiSfid) return iIndex; return NO_OF_QUEUES+1; @@ -53,7 +53,7 @@ static INT SearchFreeSfid(PMINI_ADAPTER Adapter) { UINT uiIndex=0; - for (uiIndex=0; uiIndex < (NO_OF_QUEUES-1); uiIndex++) + for (uiIndex = 0; uiIndex < (NO_OF_QUEUES - 1); uiIndex++) if (Adapter->PackInfo[uiIndex].ulSFID==0) return uiIndex; return NO_OF_QUEUES+1; @@ -71,7 +71,7 @@ static INT SearchFreeSfid(PMINI_ADAPTER Adapter) static int SearchClsid(PMINI_ADAPTER Adapter,ULONG ulSFID,B_UINT16 uiClassifierID) { unsigned int uiClassifierIndex = 0; - for (uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++) { + for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS; uiClassifierIndex++) { if ((Adapter->astClassifierTable[uiClassifierIndex].bUsed) && (Adapter->astClassifierTable[uiClassifierIndex].uiClassifierRuleIndex == uiClassifierID)&& (Adapter->astClassifierTable[uiClassifierIndex].ulSFID == ulSFID)) @@ -89,7 +89,7 @@ static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/ ) { unsigned int uiClassifierIndex = 0; - for (uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++) { + for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS; uiClassifierIndex++) { if (!Adapter->astClassifierTable[uiClassifierIndex].bUsed) return uiClassifierIndex; } @@ -220,8 +220,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry , } if (bIpVersion6) { //Restore EndianNess of Struct - for (ucLoopIndex =0 ; ucLoopIndex < MAX_IP_RANGE_LENGTH * 4 ; - ucLoopIndex++) { + for (ucLoopIndex = 0; ucLoopIndex < MAX_IP_RANGE_LENGTH * 4; ucLoopIndex++) { if (eIpAddrContext == eSrcIpAddress) { pstClassifierEntry->stSrcIpAddress.ulIpv6Addr[ucLoopIndex]= ntohl(pstClassifierEntry->stSrcIpAddress. @@ -243,7 +242,7 @@ CopyIpAddrToClassifier(S_CLASSIFIER_RULE *pstClassifierEntry , void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter,B_UINT16 TID,BOOLEAN bFreeAll) { ULONG ulIndex; - for (ulIndex=0; ulIndex < Adapter->ulTotalTargetBuffersAvailable; ulIndex++) { + for (ulIndex = 0; ulIndex < Adapter->ulTotalTargetBuffersAvailable; ulIndex++) { if (Adapter->astTargetDsxBuffer[ulIndex].valid) continue; if ((bFreeAll) || (Adapter->astTargetDsxBuffer[ulIndex].tid == TID)){ @@ -293,7 +292,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT "Destination Port Range Length:0x%X\n", pstClassifierEntry->ucDestPortRangeLength); if ( MAX_PORT_RANGE >= psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRangeLength) { - for (ucLoopIndex=0;ucLoopIndex<(pstClassifierEntry->ucDestPortRangeLength);ucLoopIndex++) { + for (ucLoopIndex = 0; ucLoopIndex < (pstClassifierEntry->ucDestPortRangeLength); ucLoopIndex++) { pstClassifierEntry->usDestPortRangeLo[ucLoopIndex] = *((PUSHORT)(psfCSType->cCPacketClassificationRule.u8ProtocolDestPortRange+ucLoopIndex)); pstClassifierEntry->usDestPortRangeHi[ucLoopIndex] = @@ -316,8 +315,10 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT pstClassifierEntry->ucSrcPortRangeLength = psfCSType->cCPacketClassificationRule. u8ProtocolSourcePortRangeLength/4; - for (ucLoopIndex = 0; ucLoopIndex < - (pstClassifierEntry->ucSrcPortRangeLength); ucLoopIndex++) { + for (ucLoopIndex = 0; + ucLoopIndex < + pstClassifierEntry->ucSrcPortRangeLength; + ucLoopIndex++) { pstClassifierEntry->usSrcPortRangeLo[ucLoopIndex] = *((PUSHORT)(psfCSType->cCPacketClassificationRule. u8ProtocolSourcePortRange+ucLoopIndex)); @@ -470,7 +471,7 @@ VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter,UINT uiSearchRuleIndex) return; - for (nClassifierIndex =0 ; nClassifierIndex < MAX_CLASSIFIERS ; nClassifierIndex++) { + for (nClassifierIndex = 0; nClassifierIndex < MAX_CLASSIFIERS; nClassifierIndex++) { if (Adapter->astClassifierTable[nClassifierIndex].usVCID_Value == ulVCID) { pstClassifierEntry = &Adapter->astClassifierTable[nClassifierIndex]; if (pstClassifierEntry->bUsed) { @@ -606,7 +607,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A Adapter->PackInfo[uiSearchRuleIndex].u8TrafficPriority = psfLocalSet->u8TrafficPriority; //copy all the classifier in the Service Flow param structure - for (nIndex=0; nIndex<psfLocalSet->u8TotalClassifiers; nIndex++) { + for (nIndex = 0; nIndex < psfLocalSet->u8TotalClassifiers; nIndex++) { bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, "Classifier index =%d\n", nIndex); psfCSType = &psfLocalSet->cConvergenceSLTypes[nIndex]; @@ -718,7 +719,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A } //Repeat parsing Classification Entries to process PHS Rules - for (nIndex=0; nIndex < psfLocalSet->u8TotalClassifiers; nIndex++) { + for (nIndex = 0; nIndex < psfLocalSet->u8TotalClassifiers; nIndex++) { psfCSType = &psfLocalSet->cConvergenceSLTypes[nIndex]; bcm_dbg(Adapter, OTHERS, CONN_MSG, ALL, @@ -767,7 +768,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A //Apply This PHS Rule to all classifiers whose Associated PHSI Match unsigned int uiClassifierIndex = 0; if (pstAddIndication->u8Direction == UPLINK_DIR ) { - for (uiClassifierIndex=0;uiClassifierIndex<MAX_CLASSIFIERS;uiClassifierIndex++) { + for (uiClassifierIndex = 0; uiClassifierIndex < MAX_CLASSIFIERS; uiClassifierIndex++) { if ((Adapter->astClassifierTable[uiClassifierIndex].bUsed) && (Adapter->astClassifierTable[uiClassifierIndex].ulSFID == Adapter->PackInfo[uiSearchRuleIndex].ulSFID) && (Adapter->astClassifierTable[uiClassifierIndex].u8AssociatedPHSI == psfCSType->cPhsRule.u8PHSI)) { @@ -1109,7 +1110,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) pstAddIndication->sfAuthorizedSet.u16MacOverhead); if (!pstAddIndication->sfAuthorizedSet.bValid) pstAddIndication->sfAuthorizedSet.bValid=1; - for (nIndex = 0 ; nIndex < nCurClassifierCnt ; nIndex++) { + for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) { stConvergenceSLTypes *psfCSType = NULL; psfCSType = &pstAddIndication->sfAuthorizedSet.cConvergenceSLTypes[nIndex]; @@ -1131,7 +1132,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1], psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]); - for (uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 1; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8Protocol : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8Protocol); @@ -1140,7 +1141,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) "u8IPMaskedSourceAddressLength :0x%X\n", psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength); - for (uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8IPMaskedSourceAddress[32] : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]); @@ -1149,7 +1150,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) "u8IPDestinationAddressLength : 0x%X\n", psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength); - for (uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8IPDestinationAddress[32] : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]); @@ -1373,7 +1374,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) } - for (nIndex = 0 ; nIndex < nCurClassifierCnt ; nIndex++) { + for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) { stConvergenceSLTypes *psfCSType = NULL; psfCSType = &pstAddIndication->sfAdmittedSet.cConvergenceSLTypes[nIndex]; @@ -1393,7 +1394,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0], psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1], psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]); - for (uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 1; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8Protocol: 0x%02X\n", psfCSType->cCPacketClassificationRule.u8Protocol); @@ -1402,7 +1403,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) "u8IPMaskedSourceAddressLength :0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength); - for (uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8IPMaskedSourceAddress[32] : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]); @@ -1411,7 +1412,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) "u8IPDestinationAddressLength : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength); - for (uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8IPDestinationAddress[32] : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]); @@ -1632,7 +1633,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) nCurClassifierCnt = MAX_CLASSIFIERS_IN_SF; } - for (nIndex = 0 ; nIndex < nCurClassifierCnt ; nIndex++) { + for (nIndex = 0; nIndex < nCurClassifierCnt; nIndex++) { stConvergenceSLTypes *psfCSType = NULL; psfCSType = &pstAddIndication->sfActiveSet.cConvergenceSLTypes[nIndex]; @@ -1653,7 +1654,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0], psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1], psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]); - for (uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 1; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8Protocol : 0x%X\n", psfCSType->cCPacketClassificationRule.u8Protocol); @@ -1662,7 +1663,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) "u8IPMaskedSourceAddressLength :0x%X\n", psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddressLength); - for (uiLoopIndex=0; uiLoopIndex < 32; uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8IPMaskedSourceAddress[32]:0x%X\n", psfCSType->cCPacketClassificationRule.u8IPMaskedSourceAddress[uiLoopIndex]); @@ -1671,7 +1672,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) "u8IPDestinationAddressLength : 0x%02X\n", psfCSType->cCPacketClassificationRule.u8IPDestinationAddressLength); - for (uiLoopIndex=0;uiLoopIndex<32;uiLoopIndex++) + for (uiLoopIndex = 0; uiLoopIndex < 32; uiLoopIndex++) bcm_dbg(Adapter, OTHERS, DUMP_CONTROL, ALL, "u8IPDestinationAddress[32]:0x%X\n", psfCSType->cCPacketClassificationRule.u8IPDestinationAddress[uiLoopIndex]); @@ -2062,7 +2063,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter) "Total Target DSX Buffer setup %lx\n", Adapter->ulTotalTargetBuffersAvailable); - for (ulIndex=0; ulIndex < Adapter->ulTotalTargetBuffersAvailable ; ulIndex++) { + for (ulIndex = 0; ulIndex < Adapter->ulTotalTargetBuffersAvailable; ulIndex++) { Adapter->astTargetDsxBuffer[ulIndex].ulTargetDsxBuffer = ulTargetDsxBuffersBase; Adapter->astTargetDsxBuffer[ulIndex].valid=1; Adapter->astTargetDsxBuffer[ulIndex].tid=0; diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c index 5f341b5..48f6d41 100644 --- a/drivers/staging/bcm/IPv6Protocol.c +++ b/drivers/staging/bcm/IPv6Protocol.c @@ -266,11 +266,11 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head //First Convert the Ip Address in the packet to Host Endian order - for (uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++) { + for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { aulSrcIP[uiIpv6AddIndex]=ntohl(pstIpv6Header->ulSrcIpAddress[uiIpv6AddIndex]); } - for (uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) { + for (uiLoopIndex = 0; uiLoopIndex < uiCountIPSrcAddresses; uiLoopIndex += uiIpv6AddrNoLongWords) { bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Src Ipv6 Address In Received Packet :\n"); DumpIpv6Address(aulSrcIP); @@ -281,7 +281,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head "Src Ipv6 Address In Classifier Rule :\n"); DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex]); - for (uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++) { + for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { if ((pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex+uiIpv6AddIndex] & aulSrcIP[uiIpv6AddIndex]) != pstClassifierRule->stSrcIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex]) { //Match failed for current Ipv6 Address.Try next Ipv6 Address @@ -318,11 +318,11 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea //First Convert the Ip Address in the packet to Host Endian order - for (uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++) { + for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { aulDestIP[uiIpv6AddIndex]=ntohl(pstIpv6Header->ulDestIpAddress[uiIpv6AddIndex]); } - for (uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) { + for (uiLoopIndex = 0; uiLoopIndex < uiCountIPDestinationAddresses; uiLoopIndex += uiIpv6AddrNoLongWords) { bcm_dbg(Adapter, TX, IPV6_DBG, ALL, "Destination Ipv6 Address In Received Packet :\n"); DumpIpv6Address(aulDestIP); @@ -333,7 +333,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea "Destination Ipv6 Address In Classifier Rule :\n"); DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex]); - for (uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++) { + for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { if ((pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex+uiIpv6AddIndex] & aulDestIP[uiIpv6AddIndex]) != pstClassifierRule->stDestIpAddress.ulIpv6Addr[uiLoopIndex+uiIpv6AddIndex]) { //Match failed for current Ipv6 Address.Try next Ipv6 Address @@ -357,7 +357,7 @@ VOID DumpIpv6Address(ULONG *puIpv6Address) UINT uiIpv6AddrNoLongWords = 4; UINT uiIpv6AddIndex=0; PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); - for (uiIpv6AddIndex=0;uiIpv6AddIndex<uiIpv6AddrNoLongWords;uiIpv6AddIndex++) { + for (uiIpv6AddIndex = 0; uiIpv6AddIndex < uiIpv6AddrNoLongWords; uiIpv6AddIndex++) { bcm_dbg(Adapter, TX, IPV6_DBG, ALL, ":%lx\n", puIpv6Address[uiIpv6AddIndex]); } diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c index d96c256..c18dcc8 100644 --- a/drivers/staging/bcm/LeakyBucket.c +++ b/drivers/staging/bcm/LeakyBucket.c @@ -128,7 +128,7 @@ static INT SendPacketFromQueue(PMINI_ADAPTER Adapter,/**<Logical Adapter*/ PktLen = Packet->len; Status = SetupNextSend(Adapter, Packet, psSF->usVCID_Value); if (Status == 0) { - for (uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++) + for (uiIndex = 0; uiIndex < MIBS_MAX_HIST_ENTRIES; uiIndex++) { if ((PktLen <= MIBS_PKTSIZEHIST_RANGE*(uiIndex+1)) && (PktLen > MIBS_PKTSIZEHIST_RANGE*(uiIndex))) Adapter->aTxPktSizeHist[uiIndex]++; } @@ -290,7 +290,7 @@ VOID transmit_packets(PMINI_ADAPTER Adapter) uiPrevTotalCount = atomic_read(&Adapter->TotalPacketCount); - for (iIndex=HiPriority;iIndex>=0;iIndex--) { + for (iIndex = HiPriority; iIndex >= 0; iIndex--) { if ( !uiPrevTotalCount || (TRUE == Adapter->device_removed)) break; @@ -307,7 +307,7 @@ VOID transmit_packets(PMINI_ADAPTER Adapter) while (uiPrevTotalCount > 0 && !Adapter->device_removed) { exit_flag = TRUE ; //second iteration to parse non-pending queues - for (iIndex=HiPriority;iIndex>=0;iIndex--) { + for (iIndex = HiPriority; iIndex >= 0; iIndex--) { if ( !uiPrevTotalCount || (TRUE == Adapter->device_removed)) break; diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c index cbd46a4..10b33a4 100644 --- a/drivers/staging/bcm/Misc.c +++ b/drivers/staging/bcm/Misc.c @@ -10,7 +10,7 @@ static VOID default_wimax_protocol_initialize(PMINI_ADAPTER Adapter) { UINT uiLoopIndex; - for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES-1; uiLoopIndex++) { + for (uiLoopIndex = 0; uiLoopIndex < NO_OF_QUEUES - 1; uiLoopIndex++) { Adapter->PackInfo[uiLoopIndex].uiThreshold = TX_PACKET_THRESHOLD; Adapter->PackInfo[uiLoopIndex].uiMaxAllowedRate = MAX_ALLOWED_RATE; Adapter->PackInfo[uiLoopIndex].uiMaxBucketSize = 20*1024*1024; diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c index 3beb50e..735434b 100644 --- a/drivers/staging/bcm/PHSModule.c +++ b/drivers/staging/bcm/PHSModule.c @@ -297,7 +297,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,PMINI_ADAPTER Adapter) } pstServiceFlowTable = pPhsdeviceExtension->pstServiceFlowPhsRulesTable; - for (i=0;i<MAX_SERVICEFLOWS;i++) { + for (i = 0; i < MAX_SERVICEFLOWS; i++) { S_SERVICEFLOW_ENTRY sServiceFlow = pstServiceFlowTable->stSFList[i]; sServiceFlow.pstClassifierTable = kzalloc(sizeof(S_CLASSIFIER_TABLE), GFP_KERNEL); if (!sServiceFlow.pstClassifierTable) { @@ -467,7 +467,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI) pstClassifierRulesTable=pstServiceFlowEntry->pstClassifierTable; if (pstClassifierRulesTable) { - for (nClsidIndex=0;nClsidIndex<MAX_PHSRULE_PER_SF;nClsidIndex++) { + for (nClsidIndex = 0; nClsidIndex < MAX_PHSRULE_PER_SF; nClsidIndex++) { if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].bUsed && pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule) { if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8PHSI == u8PHSI) { if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt) @@ -584,7 +584,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid) pstClassifierRulesTable=pstServiceFlowEntry->pstClassifierTable; if (pstClassifierRulesTable) { - for (nClsidIndex=0;nClsidIndex<MAX_PHSRULE_PER_SF;nClsidIndex++) { + for (nClsidIndex = 0; nClsidIndex < MAX_PHSRULE_PER_SF; nClsidIndex++) { if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule) { if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex] .pstPhsRule->u8RefCnt) @@ -817,14 +817,14 @@ static void free_phs_serviceflow_rules(S_SERVICEFLOW_TABLE *psServiceFlowRulesTa bcm_dbg(Adapter, OTHERS, PHS_DISPATCH, ALL, "=======>\n"); if (psServiceFlowRulesTable) { - for (i=0;i<MAX_SERVICEFLOWS;i++) { + for (i = 0; i < MAX_SERVICEFLOWS; i++) { S_SERVICEFLOW_ENTRY stServiceFlowEntry = psServiceFlowRulesTable->stSFList[i]; S_CLASSIFIER_TABLE *pstClassifierRulesTable = stServiceFlowEntry.pstClassifierTable; if (pstClassifierRulesTable) { - for (j=0;j<MAX_PHSRULE_PER_SF;j++) { + for (j = 0; j < MAX_PHSRULE_PER_SF; j++) { if (pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule) { if (pstClassifierRulesTable->stActivePhsRulesList[j].pstPhsRule ->u8RefCnt) @@ -886,7 +886,7 @@ UINT GetServiceFlowEntry(IN S_SERVICEFLOW_TABLE *psServiceFlowTable, IN B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry) { int i; - for (i=0;i<MAX_SERVICEFLOWS;i++) { + for (i = 0; i < MAX_SERVICEFLOWS; i++) { if (psServiceFlowTable->stSFList[i].bUsed) { if (psServiceFlowTable->stSFList[i].uiVcid == uiVcid) { *ppstServiceFlowEntry = &psServiceFlowTable->stSFList[i]; @@ -906,7 +906,7 @@ UINT GetClassifierEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable, { int i; S_CLASSIFIER_ENTRY *psClassifierRules = NULL; - for (i=0;i<MAX_PHSRULE_PER_SF;i++) { + for (i = 0; i < MAX_PHSRULE_PER_SF; i++) { if (eClsContext == eActiveClassifierRuleContext) { psClassifierRules = &pstClassifierTable->stActivePhsRulesList[i]; @@ -933,7 +933,7 @@ static UINT GetPhsRuleEntry(IN S_CLASSIFIER_TABLE *pstClassifierTable, { int i; S_CLASSIFIER_ENTRY *pstClassifierRule = NULL; - for (i=0;i<MAX_PHSRULE_PER_SF;i++) { + for (i = 0; i < MAX_PHSRULE_PER_SF; i++) { if (eClsContext == eActiveClassifierRuleContext) { pstClassifierRule = &pstClassifierTable->stActivePhsRulesList[i]; } else { @@ -962,7 +962,7 @@ UINT CreateSFToClassifierRuleMapping(IN B_UINT16 uiVcid,IN B_UINT16 uiClsId, int iSfIndex; BOOLEAN bFreeEntryFound =FALSE; //Check for a free entry in SFID table - for (iSfIndex=0;iSfIndex < MAX_SERVICEFLOWS;iSfIndex++) { + for (iSfIndex = 0; iSfIndex < MAX_SERVICEFLOWS; iSfIndex++) { if (!psServiceFlowTable->stSFList[iSfIndex].bUsed) { bFreeEntryFound = TRUE; break; @@ -1240,12 +1240,12 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension) int i,j,k,l; PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "Dumping PHS Rules :\n"); - for (i=0;i<MAX_SERVICEFLOWS;i++) { + for (i = 0; i < MAX_SERVICEFLOWS; i++) { S_SERVICEFLOW_ENTRY stServFlowEntry = pDeviceExtension->pstServiceFlowPhsRulesTable->stSFList[i]; if (stServFlowEntry.bUsed) { - for (j=0;j<MAX_PHSRULE_PER_SF;j++) { - for (l=0;l<2;l++) { + for (j = 0; j < MAX_PHSRULE_PER_SF; j++) { + for (l = 0; l < 2; l++) { S_CLASSIFIER_ENTRY stClsEntry; if (l==0) { stClsEntry = stServFlowEntry.pstClassifierTable->stActivePhsRulesList[j]; @@ -1279,7 +1279,7 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension) stClsEntry.pstPhsRule->u8PHSFLength); bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "PHSF :\n"); - for (k=0;k<stClsEntry.pstPhsRule->u8PHSFLength;k++) { + for (k = 0; k < stClsEntry.pstPhsRule->u8PHSFLength; k++) { bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%#X\n", stClsEntry.pstPhsRule->u8PHSF[k]); @@ -1289,7 +1289,7 @@ void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension) stClsEntry.pstPhsRule->u8PHSMLength); bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "PHSM :\n"); - for (k=0;k<stClsEntry.pstPhsRule->u8PHSMLength;k++) { + for (k = 0; k < stClsEntry.pstPhsRule->u8PHSMLength; k++) { bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "%#X\n", stClsEntry.pstPhsRule->u8PHSM[k]); diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 17c8e4d..8acbcbb 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -33,7 +33,7 @@ BOOLEAN MatchSrcIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulSrcIP) ulSrcIP=ntohl(ulSrcIP); if (0 == pstClassifierRule->ucIPSourceAddressLength) return TRUE; - for (ucLoopIndex=0; ucLoopIndex < (pstClassifierRule->ucIPSourceAddressLength);ucLoopIndex++) { + for (ucLoopIndex = 0; ucLoopIndex < (pstClassifierRule->ucIPSourceAddressLength); ucLoopIndex++) { bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Src Ip Address Mask:0x%x PacketIp:0x%x and Classification:0x%x\n", (UINT)pstClassifierRule->stSrcIpAddress.ulIpv4Mask[ucLoopIndex], @@ -74,7 +74,7 @@ BOOLEAN MatchDestIpAddress(S_CLASSIFIER_RULE *pstClassifierRule,ULONG ulDestIP) (UINT)pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex], (UINT)pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex]); - for (ucLoopIndex=0;ucLoopIndex<(pstClassifierRule->ucIPDestinationAddressLength);ucLoopIndex++) { + for (ucLoopIndex = 0; ucLoopIndex < (pstClassifierRule->ucIPDestinationAddressLength); ucLoopIndex++) { if ((pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex] & ulDestIP)== (pstClassifierRule->stDestIpAddress.ulIpv4Addr[ucLoopIndex] & pstClassifierRule->stDestIpAddress.ulIpv4Mask[ucLoopIndex])) { return TRUE; @@ -127,7 +127,7 @@ BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol) PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); if (0 == pstClassifierRule->ucProtocolLength) return TRUE; - for (ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucProtocolLength;ucLoopIndex++) { + for (ucLoopIndex = 0; ucLoopIndex < pstClassifierRule->ucProtocolLength; ucLoopIndex++) { bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Protocol:0x%X Classification Protocol:0x%X\n", ucProtocol, pstClassifierRule->ucProtocol[ucLoopIndex]); @@ -158,10 +158,10 @@ BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort) if (0 == pstClassifierRule->ucSrcPortRangeLength) - return TRUE; - for (ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucSrcPortRangeLength;ucLoopIndex++) { - if (ushSrcPort <= pstClassifierRule->usSrcPortRangeHi[ucLoopIndex] && - ushSrcPort >= pstClassifierRule->usSrcPortRangeLo[ucLoopIndex]) { + return TRUE; + for (ucLoopIndex = 0; ucLoopIndex < pstClassifierRule->ucSrcPortRangeLength; ucLoopIndex++) { + if (ushSrcPort <= pstClassifierRule->usSrcPortRangeHi[ucLoopIndex] && + ushSrcPort >= pstClassifierRule->usSrcPortRangeLo[ucLoopIndex]) { return TRUE; } } @@ -187,9 +187,9 @@ BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushDestPort) PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); if (0 == pstClassifierRule->ucDestPortRangeLength) - return TRUE; + return TRUE; - for (ucLoopIndex=0;ucLoopIndex<pstClassifierRule->ucDestPortRangeLength;ucLoopIndex++) { + for (ucLoopIndex = 0; ucLoopIndex < pstClassifierRule->ucDestPortRangeLength; ucLoopIndex++) { bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "Matching Port:0x%X 0x%X 0x%X\n", ushDestPort, @@ -404,7 +404,7 @@ VOID flush_all_queues(PMINI_ADAPTER Adapter) bcm_dbg(Adapter, OTHERS, DUMP_INFO, ALL, "=====>\n"); // down(&Adapter->data_packet_queue_lock); - for (iQIndex=LowPriority; iQIndex<HiPriority; iQIndex++) { + for (iQIndex = LowPriority; iQIndex < HiPriority; iQIndex++) { struct net_device_stats *netstats = &Adapter->dev->stats; spin_lock_bh(&Adapter->PackInfo[iQIndex].SFQueueLock); @@ -657,7 +657,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUCH if (pstClassifierRule->ucEthCSSrcMACLen==0) return TRUE; bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "%s\n", __func__); - for (i=0;i<MAC_ADDRESS_SIZE;i++) { + for (i = 0; i < MAC_ADDRESS_SIZE; i++) { bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n", i, Mac[i], pstClassifierRule->au8EThCSSrcMAC[i], @@ -676,7 +676,7 @@ static BOOLEAN EthCSMatchDestMACAddress(S_CLASSIFIER_RULE *pstClassifierRule,PUC if (pstClassifierRule->ucEthCSDestMACLen==0) return TRUE; bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "%s\n", __func__); - for (i=0;i<MAC_ADDRESS_SIZE;i++) { + for (i = 0; i < MAC_ADDRESS_SIZE; i++) { bcm_dbg(Adapter, TX, IPV4_DBG, ALL, "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n", i, Mac[i], pstClassifierRule->au8EThCSDestMAC[i], diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index dc369b8..0096885 100644 --- a/drivers/staging/bcm/nvm.c +++ b/drivers/staging/bcm/nvm.c @@ -203,7 +203,7 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter, msleep(1); } - for ( dwIndex = 0; dwIndex < dwNumWords ; dwIndex++ ) { + for (dwIndex = 0; dwIndex < dwNumWords; dwIndex++) { /* We get only a byte at a time - from LSB to MSB. We shift it into an integer. */ pvalue = (PUCHAR)(pdwData + dwIndex); @@ -524,7 +524,7 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter) // BeceemEEPROMBulkRead(Adapter,&uiData,0x0,4); if (uiData == BECM) { - for (uiIndex = 2;uiIndex <=256; uiIndex*=2) { + for (uiIndex = 2; uiIndex <= 256; uiIndex *= 2) { BeceemEEPROMBulkRead(Adapter,&uiData,uiIndex*1024,4); if (uiData == BECM) { return uiIndex*1024; @@ -538,7 +538,7 @@ static UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter) uiData = 0xBABEFACE; if (0 == BeceemEEPROMBulkWrite(Adapter,(PUCHAR)&uiData,0,4,TRUE)) { uiData = 0; - for (uiIndex = 2;uiIndex <=256; uiIndex*=2) { + for (uiIndex = 2; uiIndex <= 256; uiIndex *= 2) { BeceemEEPROMBulkRead(Adapter,&uiData,uiIndex*1024,4); if (uiData == 0xBABEFACE) { return uiIndex*1024; @@ -576,7 +576,7 @@ static INT FlashSectorErase(PMINI_ADAPTER Adapter, UINT value; int bytes; - for (iIndex=0;iIndex<numOfSectors;iIndex++) { + for (iIndex = 0; iIndex < numOfSectors; iIndex++) { value = 0x06000000; wrmalt(Adapter, FLASH_SPI_CMDQ_REG, &value, sizeof(value)); @@ -1204,7 +1204,7 @@ static INT BeceemFlashBulkWrite( (tw.tv_sec *1000 + tw.tv_usec/1000) - (te.tv_sec *1000 + te.tv_usec/1000)); */ - for (uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE) { + for (uiIndex = 0; uiIndex < Adapter->uiSectorSize; uiIndex += MAX_RW_SIZE) { if (STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE)) { if (Adapter->ulFlashWriteSize == 1) { UINT uiReadIndex = 0; @@ -1393,7 +1393,7 @@ static INT BeceemFlashBulkWriteStatus( } if (bVerify) { - for (uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE) { + for (uiIndex = 0; uiIndex < Adapter->uiSectorSize; uiIndex += MAX_RW_SIZE) { if (STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE)) { if (memcmp(ucReadBk,&pTempBuff[uiIndex],MAX_RW_SIZE)) { @@ -2513,7 +2513,7 @@ static INT BcmDumpFlash2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo,PMINI_ADAP psFlash2xCSInfo->OffsetFromZeroForVSA2End); bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "Sector Access Bit Map is Defined as :\n"); - for (Index =0; Index <(FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)); Index++) { + for (Index = 0; Index < (FLASH2X_TOTAL_SIZE / (DEFAULT_SECTOR_SIZE * 16)); Index++) { bcm_dbg(Adapter, OTHERS, NVM_RW, ALL, "SectorAccessBitMap[%d] :0x%x\n", Index, psFlash2xCSInfo->SectorAccessBitMap[Index]); @@ -2572,7 +2572,7 @@ static INT ConvertEndianOf2XCSStructure(PFLASH2X_CS_INFO psFlash2xCSInfo) psFlash2xCSInfo->OffsetFromZeroForVSA1End = ntohl(psFlash2xCSInfo->OffsetFromZeroForVSA1End); psFlash2xCSInfo->OffsetFromZeroForVSA2Start = ntohl(psFlash2xCSInfo->OffsetFromZeroForVSA2Start); psFlash2xCSInfo->OffsetFromZeroForVSA2End = ntohl(psFlash2xCSInfo->OffsetFromZeroForVSA2End); - for (Index =0; Index <(FLASH2X_TOTAL_SIZE/(DEFAULT_SECTOR_SIZE *16)); Index++) { + for (Index = 0; Index < (FLASH2X_TOTAL_SIZE / (DEFAULT_SECTOR_SIZE * 16)); Index++) { psFlash2xCSInfo->SectorAccessBitMap[Index] = ntohl(psFlash2xCSInfo->SectorAccessBitMap[Index]); } return STATUS_SUCCESS; @@ -2625,7 +2625,7 @@ static VOID UpdateVendorInfo(PMINI_ADAPTER Adapter) Adapter->uiVendorExtnFlag = FALSE; - for (i = 0;i < TOTAL_SECTIONS;i++) + for (i = 0; i < TOTAL_SECTIONS; i++) Adapter->psFlash2xVendorInfo->VendorSection[i].OffsetFromZeroForSectionStart = UNINIT_PTR_IN_CS; if (STATUS_SUCCESS != vendorextnGetSectionInfo(Adapter, Adapter->psFlash2xVendorInfo)) @@ -3931,7 +3931,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) //If this is header sector write 0xFFFFFFFF at the sig time and in last write sig memcpy(SigBuff, Buff + sigOffset, MAX_RW_SIZE); - for (i = 0; i < MAX_RW_SIZE;i++) + for (i = 0; i < MAX_RW_SIZE; i++) *(Buff + sigOffset + i) = 0xFF; } Adapter->bHeaderChangeAllowed = TRUE ; @@ -4050,7 +4050,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut) //If this is header sector write 0xFFFFFFFF at the sig time and in last write sig memcpy(SigBuff, Buff + sigOffset, MAX_RW_SIZE); - for (i = 0; i < MAX_RW_SIZE;i++) + for (i = 0; i < MAX_RW_SIZE; i++) *(Buff + sigOffset + i) = 0xFF; } @@ -4766,7 +4766,7 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter, BcmDoChipSelect(Adapter,uiOffset); uiPartOffset = (uiOffset & (FLASH_PART_SIZE - 1)) + GetFlashBaseAddr(Adapter); - for (i = 0 ; i< uiNumBytes; i += Adapter->ulFlashWriteSize) { + for (i = 0; i < uiNumBytes; i += Adapter->ulFlashWriteSize) { if (Adapter->ulFlashWriteSize == BYTE_WRITE_SUPPORT) Status = flashByteWrite(Adapter,uiPartOffset, pcBuff); else -- 1.7.8.111.gad25c.dirty _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel