staging: fix bcm/hostmibs.c checkpatch problems
PATCH 1/1 staging: fix bcm/hostmibs.c checkpatch problems
From: Jake Edge <[email protected]>
Fix 4 checkpatch errors, many warnings in bcm/hostmibs.c
Against next-20140321 tree
---
There were two > 80 lines that I couldn't find a sensible way to split up, otherwise it is checkpatch clean
drivers/staging/bcm/hostmibs.c +50 -27
@@ -9,27 +9,32 @@#include "headers.h" -INT ProcessGetHostMibs (struct bcm_mini_adapter *Adapter,struct bcm_host_stats_mibs *pstHostMibs) +INT ProcessGetHostMibs (struct bcm_mini_adapter *Adapter, +struct bcm_host_stats_mibs *pstHostMibs) {struct bcm_phs_entry *pstServiceFlowEntry =NULL ;struct bcm_phs_rule *pstPhsRule =NULL ;struct bcm_phs_classifier_table *pstClassifierTable =NULL ;struct bcm_phs_classifier_entry *pstClassifierRule =NULL ; -struct bcm_phs_extension *pDeviceExtension = (struct bcm_phs_extension *) &Adapter->stBCMPhsContext; +struct bcm_phs_extension *pDeviceExtension = + (struct bcm_phs_extension *) &Adapter->stBCMPhsContext; -UINT nClassifierIndex =0 , nPhsTableIndex =0 , nSfIndex =0 , uiIndex =0 ; +UINT nClassifierIndex =0 , nPhsTableIndex =0 , + nSfIndex =0 , uiIndex =0 ;if (pDeviceExtension ==NULL ) { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,HOST_MIBS ,DBG_LVL_ALL ,"Invalid Device Extension\n" ); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,HOST_MIBS , +DBG_LVL_ALL ,"Invalid Device Extension\n" );return STATUS_FAILURE ; }/* Copy the classifier Table */ -for (nClassifierIndex =0 ; nClassifierIndex <MAX_CLASSIFIERS ; nClassifierIndex++) { +for (nClassifierIndex =0 ; nClassifierIndex <MAX_CLASSIFIERS ; + nClassifierIndex++) {if (Adapter->astClassifierTable[nClassifierIndex].bUsed == TRUE) -memcpy ((PVOID ) &pstHostMibs-> +memcpy ((PVOID )&pstHostMibs-> astClassifierTable[nClassifierIndex], - (PVOID ) &Adapter-> + (PVOID )&Adapter-> astClassifierTable[nClassifierIndex],sizeof (struct bcm_mibs_classifier_rule )); }
@@ -37,8 +42,8 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m/* Copy the SF Table */ for (nSfIndex =0 ; nSfIndex <NO_OF_QUEUES ; nSfIndex++) {if (Adapter->PackInfo[nSfIndex].bValid) { -memcpy ((PVOID ) &pstHostMibs->astSFtable[nSfIndex], - (PVOID ) &Adapter->PackInfo[nSfIndex], +memcpy ((PVOID )&pstHostMibs->astSFtable[nSfIndex], + (PVOID )&Adapter->PackInfo[nSfIndex],sizeof (struct bcm_mibs_table )); }else {/* If index in not valid,
@@ -70,7 +75,8 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_mmemcpy (&pstHostMibs-> astPhsRulesTable[nPhsTableIndex].u8PHSI, - &pstPhsRule->u8PHSI,sizeof (struct bcm_phs_rule )); + &pstPhsRule->u8PHSI, +sizeof (struct bcm_phs_rule )); nPhsTableIndex++; }
@@ -82,53 +88,70 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m/* Copy other Host Statistics parameters */ pstHostMibs->stHostInfo.GoodTransmits = Adapter->dev->stats.tx_packets; pstHostMibs->stHostInfo.GoodReceives = Adapter->dev->stats.rx_packets; - pstHostMibs->stHostInfo.CurrNumFreeDesc =atomic_read (&Adapter->CurrNumFreeTxDesc); + pstHostMibs->stHostInfo.CurrNumFreeDesc = +atomic_read (&Adapter->CurrNumFreeTxDesc); pstHostMibs->stHostInfo.BEBucketSize = Adapter->BEBucketSize; pstHostMibs->stHostInfo.rtPSBucketSize = Adapter->rtPSBucketSize; pstHostMibs->stHostInfo.TimerActive = Adapter->TimerActive; pstHostMibs->stHostInfo.u32TotalDSD = Adapter->u32TotalDSD; -memcpy (pstHostMibs->stHostInfo.aTxPktSizeHist, Adapter->aTxPktSizeHist,sizeof (UINT32 ) *MIBS_MAX_HIST_ENTRIES ); -memcpy (pstHostMibs->stHostInfo.aRxPktSizeHist, Adapter->aRxPktSizeHist,sizeof (UINT32 ) *MIBS_MAX_HIST_ENTRIES ); +memcpy (pstHostMibs->stHostInfo.aTxPktSizeHist, Adapter->aTxPktSizeHist, +sizeof (UINT32 ) *MIBS_MAX_HIST_ENTRIES ); +memcpy (pstHostMibs->stHostInfo.aRxPktSizeHist, Adapter->aRxPktSizeHist, +sizeof (UINT32 ) *MIBS_MAX_HIST_ENTRIES );return STATUS_SUCCESS ; } -VOID GetDroppedAppCntrlPktMibs (struct bcm_host_stats_mibs *pstHostMibs,struct bcm_tarang_data *pTarang) +VOID GetDroppedAppCntrlPktMibs (struct bcm_host_stats_mibs *pstHostMibs, +struct bcm_tarang_data *pTarang) {memcpy (&(pstHostMibs->stDroppedAppCntrlMsgs), &(pTarang->stDroppedAppCntrlMsgs),sizeof (struct bcm_mibs_dropped_cntrl_msg )); } -VOID CopyMIBSExtendedSFParameters (struct bcm_mini_adapter *Adapter,struct bcm_connect_mgr_params *psfLocalSet,UINT uiSearchRuleIndex) +VOID CopyMIBSExtendedSFParameters (struct bcm_mini_adapter *Adapter, +struct bcm_connect_mgr_params *psfLocalSet,UINT uiSearchRuleIndex) {struct bcm_mibs_parameters *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable; t->wmanIfSfid = psfLocalSet->u32SFID; - t->wmanIfCmnCpsMaxSustainedRate = psfLocalSet->u32MaxSustainedTrafficRate; + t->wmanIfCmnCpsMaxSustainedRate = + psfLocalSet->u32MaxSustainedTrafficRate; t->wmanIfCmnCpsMaxTrafficBurst = psfLocalSet->u32MaxTrafficBurst; t->wmanIfCmnCpsMinReservedRate = psfLocalSet->u32MinReservedTrafficRate; t->wmanIfCmnCpsToleratedJitter = psfLocalSet->u32ToleratedJitter; t->wmanIfCmnCpsMaxLatency = psfLocalSet->u32MaximumLatency; - t->wmanIfCmnCpsFixedVsVariableSduInd = psfLocalSet->u8FixedLengthVSVariableLengthSDUIndicator; - t->wmanIfCmnCpsFixedVsVariableSduInd =ntohl (t->wmanIfCmnCpsFixedVsVariableSduInd); + t->wmanIfCmnCpsFixedVsVariableSduInd = + psfLocalSet->u8FixedLengthVSVariableLengthSDUIndicator; + t->wmanIfCmnCpsFixedVsVariableSduInd = +ntohl (t->wmanIfCmnCpsFixedVsVariableSduInd); t->wmanIfCmnCpsSduSize = psfLocalSet->u8SDUSize; t->wmanIfCmnCpsSduSize =ntohl (t->wmanIfCmnCpsSduSize); - t->wmanIfCmnCpsSfSchedulingType = psfLocalSet->u8ServiceFlowSchedulingType; - t->wmanIfCmnCpsSfSchedulingType =ntohl (t->wmanIfCmnCpsSfSchedulingType); + t->wmanIfCmnCpsSfSchedulingType = + psfLocalSet->u8ServiceFlowSchedulingType; + t->wmanIfCmnCpsSfSchedulingType = +ntohl (t->wmanIfCmnCpsSfSchedulingType); t->wmanIfCmnCpsArqEnable = psfLocalSet->u8ARQEnable; t->wmanIfCmnCpsArqEnable =ntohl (t->wmanIfCmnCpsArqEnable); t->wmanIfCmnCpsArqWindowSize =ntohs (psfLocalSet->u16ARQWindowSize); t->wmanIfCmnCpsArqWindowSize =ntohl (t->wmanIfCmnCpsArqWindowSize); - t->wmanIfCmnCpsArqBlockLifetime =ntohs (psfLocalSet->u16ARQBlockLifeTime); - t->wmanIfCmnCpsArqBlockLifetime =ntohl (t->wmanIfCmnCpsArqBlockLifetime); - t->wmanIfCmnCpsArqSyncLossTimeout =ntohs (psfLocalSet->u16ARQSyncLossTimeOut); - t->wmanIfCmnCpsArqSyncLossTimeout =ntohl (t->wmanIfCmnCpsArqSyncLossTimeout); + t->wmanIfCmnCpsArqBlockLifetime = +ntohs (psfLocalSet->u16ARQBlockLifeTime); + t->wmanIfCmnCpsArqBlockLifetime = +ntohl (t->wmanIfCmnCpsArqBlockLifetime); + t->wmanIfCmnCpsArqSyncLossTimeout = +ntohs (psfLocalSet->u16ARQSyncLossTimeOut); + t->wmanIfCmnCpsArqSyncLossTimeout = +ntohl (t->wmanIfCmnCpsArqSyncLossTimeout); t->wmanIfCmnCpsArqDeliverInOrder = psfLocalSet->u8ARQDeliverInOrder; - t->wmanIfCmnCpsArqDeliverInOrder =ntohl (t->wmanIfCmnCpsArqDeliverInOrder); - t->wmanIfCmnCpsArqRxPurgeTimeout =ntohs (psfLocalSet->u16ARQRxPurgeTimeOut); - t->wmanIfCmnCpsArqRxPurgeTimeout =ntohl (t->wmanIfCmnCpsArqRxPurgeTimeout); + t->wmanIfCmnCpsArqDeliverInOrder = +ntohl (t->wmanIfCmnCpsArqDeliverInOrder); + t->wmanIfCmnCpsArqRxPurgeTimeout = +ntohs (psfLocalSet->u16ARQRxPurgeTimeOut); + t->wmanIfCmnCpsArqRxPurgeTimeout = +ntohl (t->wmanIfCmnCpsArqRxPurgeTimeout); t->wmanIfCmnCpsArqBlockSize =ntohs (psfLocalSet->u16ARQBlockSize); t->wmanIfCmnCpsArqBlockSize =ntohl (t->wmanIfCmnCpsArqBlockSize); t->wmanIfCmnCpsReqTxPolicy = psfLocalSet->u8RequesttransmissionPolicy;
Signature · 1 line
Jake Edge - [email protected] - http://www.edge2.net
Quoted 1 line · Jake Edge
Fix 4 checkpatch errors, many warnings in
bcm/hostmibs.c
Making code checkpatch clean shouldn't be the primary goal here.
Removing uses of Hungarian-style notation, CamelCase naming, and long variable names would be more helpful overall.
drivers/staging/bcm/hostmibs.c
Quoted 1 line
drivers/staging/bcm/hostmibs.c +0
-0
[]
drivers/staging/bcm/hostmibs.c
Quoted 1 line
drivers/staging/bcm/hostmibs.c +0
-0@@ -9,27 +9,32 @@
[]
drivers/staging/bcm/hostmibs.c line 13
Quoted 3 lines
drivers/staging/bcm/hostmibs.c +2
-1-INT ProcessGetHostMibs (struct bcm_mini_adapter *Adapter,struct bcm_host_stats_mibs *pstHostMibs) +INT ProcessGetHostMibs (struct bcm_mini_adapter *Adapter, +struct bcm_host_stats_mibs *pstHostMibs)
[]
drivers/staging/bcm/hostmibs.c line 20
Quoted 3 lines
drivers/staging/bcm/hostmibs.c +2
-1-struct bcm_phs_extension *pDeviceExtension = (struct bcm_phs_extension *) &Adapter->stBCMPhsContext; +struct bcm_phs_extension *pDeviceExtension = + (struct bcm_phs_extension *) &Adapter->stBCMPhsContext;
btw: this cast is unnecessary. &Adapter->stBCMPhsContext is a (struct bcm_phs_extension *)
drivers/staging/bcm/hostmibs.c line 23
Quoted 3 lines
drivers/staging/bcm/hostmibs.c +2
-1-UINT nClassifierIndex =0 , nPhsTableIndex =0 , nSfIndex =0 , uiIndex =0 ; +UINT nClassifierIndex =0 , nPhsTableIndex =0 , + nSfIndex =0 , uiIndex =0 ;
Using one initializer per line is generally better.
[]
drivers/staging/bcm/hostmibs.c line 39
Quoted 12 lines
drivers/staging/bcm/hostmibs.c +4
-3/* Copy the classifier Table */ -for (nClassifierIndex =0 ; nClassifierIndex <MAX_CLASSIFIERS ; nClassifierIndex++) { +for (nClassifierIndex =0 ; nClassifierIndex <MAX_CLASSIFIERS ; + nClassifierIndex++) {if (Adapter->astClassifierTable[nClassifierIndex].bUsed == TRUE) -memcpy ((PVOID ) &pstHostMibs-> +memcpy ((PVOID )&pstHostMibs-> astClassifierTable[nClassifierIndex], - (PVOID ) &Adapter-> + (PVOID )&Adapter-> astClassifierTable[nClassifierIndex],sizeof (struct bcm_mibs_classifier_rule ));
You could remove the (PVOID) casts here.
mem<foo> pointers don't need to be cast to void,
the compiler already does that.
drivers/staging/bcm/hostmibs.c INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m · line 96
Quoted 11 lines
drivers/staging/bcm/hostmibs.c +2
-1@@ -82,53 +88,70 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m/* Copy other Host Statistics parameters */ pstHostMibs->stHostInfo.GoodTransmits = Adapter->dev->stats.tx_packets; pstHostMibs->stHostInfo.GoodReceives = Adapter->dev->stats.rx_packets; - pstHostMibs->stHostInfo.CurrNumFreeDesc =atomic_read (&Adapter->CurrNumFreeTxDesc); + pstHostMibs->stHostInfo.CurrNumFreeDesc = +atomic_read (&Adapter->CurrNumFreeTxDesc); pstHostMibs->stHostInfo.BEBucketSize = Adapter->BEBucketSize; pstHostMibs->stHostInfo.rtPSBucketSize = Adapter->rtPSBucketSize; pstHostMibs->stHostInfo.TimerActive = Adapter->TimerActive; pstHostMibs->stHostInfo.u32TotalDSD = Adapter->u32TotalDSD;
maybe use a temporary for &pst->stHostInfo and change all of these to
host_info-><foo> = Adapter-><bar>;
Quoted 4 lines · On Sun, 23 Mar 2014 10:45:09 -0700 Joe Perches wrote:
Quoted 1 line · Jake Edge
Fix 4 checkpatch errors, many warnings in
bcm/hostmibs.cMaking code checkpatch clean shouldn't be the primary goal here.
Perhaps not, but it was *my* goal :)
Quoted 2 lines
Removing uses of Hungarian-style notation, CamelCase naming, and long variable names would be more helpful overall.
I don't have enough experience to feel comfortable about doing that yet, but I did take some of your suggestions and am respinning the patch ...
thanks,
jake
Signature · 1 line
Jake Edge - [email protected] - http://www.edge2.net