From 1c53f0877e874e4713e73342e51f8f3543fd59f9 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 15 Jul 2014 09:43:11 +0200
Subject: [PATCH] Staging: bcm: PHSModule.c: Simplified nested if statements by
 linking them with logical AND in GetServiceFlowEntry()

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 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 5eec7065ea6e..4074eb8550bd 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -990,11 +990,10 @@ static UINT GetClassifierEntry(IN struct bcm_phs_classifier_table *pstClassifier
 			psClassifierRules =
 				&pstClassifierTable->stOldPhsRulesList[i];
 
-		if (psClassifierRules->bUsed) {
-			if (psClassifierRules->uiClassifierRuleId == uiClsid) {
-				*ppstClassifierEntry = psClassifierRules;
-				return i;
-			}
+		if (psClassifierRules->bUsed &&
+		   (psClassifierRules->uiClassifierRuleId == uiClsid)) {
+			*ppstClassifierEntry = psClassifierRules;
+			return i;
 		}
 	}
 
-- 
2.30.2