summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2014-07-15 07:43:10 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-15 15:09:49 (GMT)
commitc842dd2ddb888d64ad50387d36f93a5225cb0a9b (patch)
treeeadb34308fd3284ee8691f9d17f2abc3858ac22e
parentcf423564fae6cab1fafad556e50de473225db834 (diff)
downloadlinux-c842dd2ddb888d64ad50387d36f93a5225cb0a9b.tar.xz
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>
-rw-r--r--drivers/staging/bcm/PHSModule.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index 83bd12b..5eec706 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -963,11 +963,9 @@ UINT GetServiceFlowEntry(IN struct bcm_phs_table *psServiceFlowTable,
for (i = 0; i < MAX_SERVICEFLOWS; i++) {
curr_sf_list = &psServiceFlowTable->stSFList[i];
- if (curr_sf_list->bUsed) {
- if (curr_sf_list->uiVcid == uiVcid) {
- *ppstServiceFlowEntry = curr_sf_list;
- return i;
- }
+ if (curr_sf_list->bUsed && (curr_sf_list->uiVcid == uiVcid)) {
+ *ppstServiceFlowEntry = curr_sf_list;
+ return i;
}
}