OSDN Git Service

Staging: bcm: PHSModule.c: Reduced indentation level by using jump label
authorMatthias Beyer <mail@beyermatthias.de>
Tue, 15 Jul 2014 07:42:59 +0000 (09:42 +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 89cc90c..a11474c 100644 (file)
@@ -564,44 +564,47 @@ ULONG PhsDeleteClassifierRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT1
        struct bcm_phs_extension *pDeviceExtension =
                (struct bcm_phs_extension *)pvContext;
 
-       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;
+
+       /* 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;
+       }
 
-               nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
-                                                uiClsId,
-                                                eActiveClassifierRuleContext,
-                                                &pstClassifierEntry);
+       nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
+                                        uiClsId,
+                                        eActiveClassifierRuleContext,
+                                        &pstClassifierEntry);
 
-               if ((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule)) {
-                       if (pstClassifierEntry->pstPhsRule) {
-                               if (pstClassifierEntry->pstPhsRule->u8RefCnt)
-                                       pstClassifierEntry->pstPhsRule->u8RefCnt--;
+       if ((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule)) {
+               if (pstClassifierEntry->pstPhsRule) {
+                       if (pstClassifierEntry->pstPhsRule->u8RefCnt)
+                               pstClassifierEntry->pstPhsRule->u8RefCnt--;
 
-                               if (0 == pstClassifierEntry->pstPhsRule->u8RefCnt)
-                                       kfree(pstClassifierEntry->pstPhsRule);
-                       }
-                       memset(pstClassifierEntry, 0,
-                              sizeof(struct bcm_phs_classifier_entry));
+                       if (0 == pstClassifierEntry->pstPhsRule->u8RefCnt)
+                               kfree(pstClassifierEntry->pstPhsRule);
                }
+               memset(pstClassifierEntry, 0,
+                      sizeof(struct bcm_phs_classifier_entry));
+       }
 
-               nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
-                                                uiClsId,
-                                                eOldClassifierRuleContext,
-                                                &pstClassifierEntry);
+       nClsidIndex = GetClassifierEntry(pstServiceFlowEntry->pstClassifierTable,
+                                        uiClsId,
+                                        eOldClassifierRuleContext,
+                                        &pstClassifierEntry);
 
-               if ((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule)) {
-                       kfree(pstClassifierEntry->pstPhsRule);
-                       memset(pstClassifierEntry, 0,
-                              sizeof(struct bcm_phs_classifier_entry));
-               }
+       if ((nClsidIndex != PHS_INVALID_TABLE_INDEX) && (!pstClassifierEntry->bUnclassifiedPHSRule)) {
+               kfree(pstClassifierEntry->pstPhsRule);
+               memset(pstClassifierEntry, 0,
+                      sizeof(struct bcm_phs_classifier_entry));
        }
+
+out:
        return 0;
 }