From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 15 Jul 2014 07:43:06 +0000 (+0200)
Subject: Staging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition
X-Git-Tag: firefly_0821_release~176^2~3491^2~761
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c8020cc93e53ea9fcc5df56e09b70e002e5812ce;p=firefly-linux-kernel-4.4.55.git

Staging: bcm: PHSModule.c: Replaced indentation level with goto jump on bad condition

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>
---

diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index d2aa9c911d17..c2901788cc0a 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -895,50 +895,53 @@ static void free_phs_serviceflow_rules(struct bcm_phs_table *psServiceFlowRulesT
 	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,
 			"=======>\n");
 
-	if (psServiceFlowRulesTable) {
-		for (i = 0; i < MAX_SERVICEFLOWS; i++) {
-			struct bcm_phs_entry stServiceFlowEntry =
-				psServiceFlowRulesTable->stSFList[i];
-			struct bcm_phs_classifier_table *pstClassifierRulesTable =
-				stServiceFlowEntry.pstClassifierTable;
+	if (!psServiceFlowRulesTable)
+		goto out;
 
-			if (pstClassifierRulesTable) {
-				for (j = 0; j < MAX_PHSRULE_PER_SF; j++) {
-					curr_act_rules_list =
-						&pstClassifierRulesTable->stActivePhsRulesList[j];
+	for (i = 0; i < MAX_SERVICEFLOWS; i++) {
+		struct bcm_phs_entry stServiceFlowEntry =
+			psServiceFlowRulesTable->stSFList[i];
+		struct bcm_phs_classifier_table *pstClassifierRulesTable =
+			stServiceFlowEntry.pstClassifierTable;
 
-					curr_old_rules_list =
-						&pstClassifierRulesTable->stOldPhsRulesList[j];
+		if (pstClassifierRulesTable) {
+			for (j = 0; j < MAX_PHSRULE_PER_SF; j++) {
+				curr_act_rules_list =
+					&pstClassifierRulesTable->stActivePhsRulesList[j];
 
-					if (curr_act_rules_list->pstPhsRule) {
+				curr_old_rules_list =
+					&pstClassifierRulesTable->stOldPhsRulesList[j];
 
-						if (curr_act_rules_list->pstPhsRule->u8RefCnt)
-							curr_act_rules_list->pstPhsRule->u8RefCnt--;
+				if (curr_act_rules_list->pstPhsRule) {
 
-						if (0 == curr_act_rules_list->pstPhsRule->u8RefCnt)
-							kfree(curr_act_rules_list->pstPhsRule);
+					if (curr_act_rules_list->pstPhsRule->u8RefCnt)
+						curr_act_rules_list->pstPhsRule->u8RefCnt--;
 
-						curr_act_rules_list->pstPhsRule = NULL;
-					}
+					if (0 == curr_act_rules_list->pstPhsRule->u8RefCnt)
+						kfree(curr_act_rules_list->pstPhsRule);
 
-					if (curr_old_rules_list->pstPhsRule) {
+					curr_act_rules_list->pstPhsRule = NULL;
+				}
 
-						if (curr_old_rules_list->pstPhsRule->u8RefCnt)
-							curr_old_rules_list->pstPhsRule->u8RefCnt--;
+				if (curr_old_rules_list->pstPhsRule) {
 
-						if (0 == curr_old_rules_list->pstPhsRule->u8RefCnt)
-							kfree(curr_old_rules_list->pstPhsRule);
+					if (curr_old_rules_list->pstPhsRule->u8RefCnt)
+						curr_old_rules_list->pstPhsRule->u8RefCnt--;
 
-						curr_old_rules_list->pstPhsRule = NULL;
-					}
+					if (0 == curr_old_rules_list->pstPhsRule->u8RefCnt)
+						kfree(curr_old_rules_list->pstPhsRule);
+
+					curr_old_rules_list->pstPhsRule = NULL;
 				}
-				kfree(pstClassifierRulesTable);
-				stServiceFlowEntry.pstClassifierTable =
-					pstClassifierRulesTable = NULL;
 			}
+			kfree(pstClassifierRulesTable);
+			stServiceFlowEntry.pstClassifierTable =
+				pstClassifierRulesTable = NULL;
 		}
 	}
 
+out:
+
 	kfree(psServiceFlowRulesTable);
 	psServiceFlowRulesTable = NULL;
 }