Staging: bcm: PHSModule.c: Rewrote ValidatePHSRuleComplete()

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 c2901788cc0adb216e8dbf79ab87cdabcffa5cca..9a248454a70a6e60c6861c8464207e94cf9b2c42 100644 (file)
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -948,24 +948,10 @@ out:
 
 static bool ValidatePHSRuleComplete(IN struct bcm_phs_rule *psPhsRule)
 {
-       if (psPhsRule) {
-               if (!psPhsRule->u8PHSI) {
-                       /* PHSI is not valid */
-                       return false;
-               }
-
-               if (!psPhsRule->u8PHSS) {
-                       /* PHSS Is Undefined */
-                       return false;
-               }
-
-               /* Check if PHSF is defines for the PHS Rule */
-               if (!psPhsRule->u8PHSFLength) /* If any part of PHSF is valid then Rule contains valid PHSF */
-                       return false;
-
-               return TRUE;
-       } else
-               return false;
+       return (psPhsRule &&
+               psPhsRule->u8PHSI &&
+               psPhsRule->u8PHSS &&
+               psPhsRule->u8PHSFLength);
 }
 
 UINT GetServiceFlowEntry(IN struct bcm_phs_table *psServiceFlowTable,