OSDN Git Service

Staging: bcm: PHSModule.c: Reduced indentation by using jump label in PhsDeleteSFRules()
authorMatthias Beyer <mail@beyermatthias.de>
Tue, 15 Jul 2014 07:43:01 +0000 (09:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Jul 2014 15:09:48 +0000 (08:09 -0700)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/bcm/PHSModule.c

index 7ced228..4e6bcef 100644 (file)
@@ -639,49 +639,51 @@ ULONG PhsDeleteSFRules(IN void *pvContext, IN B_UINT16 uiVcid)
        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,
                        "====>\n");
 
-       if (pDeviceExtension) {
-               /* Retrieve the SFID Entry Index for requested Service Flow */
-               nSFIndex = GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
-                                              uiVcid, &pstServiceFlowEntry);
-               if (nSFIndex == PHS_INVALID_TABLE_INDEX) {
-                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, PHS_DISPATCH,
-                                       DBG_LVL_ALL, "SFID Match Failed\n");
-                       return ERR_SF_MATCH_FAIL;
-               }
+       if (!pDeviceExtension)
+               goto out;
 
-               pstClassifierRulesTable = pstServiceFlowEntry->pstClassifierTable;
-               if (pstClassifierRulesTable) {
-                       for (nClsidIndex = 0; nClsidIndex < MAX_PHSRULE_PER_SF; nClsidIndex++) {
-                               if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule) {
+       /* Retrieve the SFID Entry Index for requested Service Flow */
+       nSFIndex = GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
+                                      uiVcid, &pstServiceFlowEntry);
+       if (nSFIndex == PHS_INVALID_TABLE_INDEX) {
+               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, PHS_DISPATCH,
+                               DBG_LVL_ALL, "SFID Match Failed\n");
+               return ERR_SF_MATCH_FAIL;
+       }
 
-                                       if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
-                                               pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt--;
+       pstClassifierRulesTable = pstServiceFlowEntry->pstClassifierTable;
+       if (pstClassifierRulesTable) {
+               for (nClsidIndex = 0; nClsidIndex < MAX_PHSRULE_PER_SF; nClsidIndex++) {
+                       if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule) {
 
-                                       if (0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
-                                               kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
+                               if (pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
+                                       pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt--;
 
-                                       pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule = NULL;
-                               }
-                               memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex],
-                                      0, sizeof(struct bcm_phs_classifier_entry));
-                               if (pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule) {
+                               if (0 == pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
+                                       kfree(pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule);
+
+                               pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex].pstPhsRule = NULL;
+                       }
+                       memset(&pstClassifierRulesTable->stActivePhsRulesList[nClsidIndex],
+                              0, sizeof(struct bcm_phs_classifier_entry));
+                       if (pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule) {
 
-                                       if (pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
-                                               pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt--;
+                               if (pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
+                                       pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt--;
 
-                                       if (0 == pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
-                                               kfree(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule);
+                               if (0 == pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule->u8RefCnt)
+                                       kfree(pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule);
 
-                                       pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule = NULL;
-                               }
-                               memset(&pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex],
-                                      0, sizeof(struct bcm_phs_classifier_entry));
+                               pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex].pstPhsRule = NULL;
                        }
+                       memset(&pstClassifierRulesTable->stOldPhsRulesList[nClsidIndex],
+                              0, sizeof(struct bcm_phs_classifier_entry));
                }
-               pstServiceFlowEntry->bUsed = false;
-               pstServiceFlowEntry->uiVcid = 0;
        }
+       pstServiceFlowEntry->bUsed = false;
+       pstServiceFlowEntry->uiVcid = 0;
 
+out:
        return 0;
 }