[PATCH 2/6] Remove redundant else statement

Eugene Krasnikov k.eugene.e at gmail.com
Mon Aug 5 09:56:17 EDT 2013


In this way all functions looks the same where first
we check for invalid parameters and then implement logic.

Signed-off-by: Eugene Krasnikov <k.eugene.e at gmail.com>
---
 smd.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/smd.c b/smd.c
index 75bee45..4eaa07e 100644
--- a/smd.c
+++ b/smd.c
@@ -1218,11 +1218,12 @@ static inline void set_feat_caps(u32 *bitmap,
 
 	if (cap < 0 || cap > 127) {
 		wcn36xx_warn("error cap idx %d", cap);
-	} else {
-		arr_idx = cap / 32;
-		bit_idx = cap % 32;
-		bitmap[arr_idx] |= (1 << bit_idx);
+		return;
 	}
+
+	arr_idx = cap / 32;
+	bit_idx = cap % 32;
+	bitmap[arr_idx] |= (1 << bit_idx);
 }
 
 static inline int get_feat_caps(u32 *bitmap,
@@ -1234,12 +1235,12 @@ static inline int get_feat_caps(u32 *bitmap,
 	if (cap < 0 || cap > 127) {
 		wcn36xx_warn("error cap idx %d", cap);
 		return -EINVAL;
-	} else {
-		arr_idx = cap / 32;
-		bit_idx = cap % 32;
-		ret = (bitmap[arr_idx] & (1 << bit_idx)) ? 1 : 0;
-		return ret;
 	}
+
+	arr_idx = cap / 32;
+	bit_idx = cap % 32;
+	ret = (bitmap[arr_idx] & (1 << bit_idx)) ? 1 : 0;
+	return ret;
 }
 
 static inline void clear_feat_caps(u32 *bitmap,
@@ -1249,11 +1250,12 @@ static inline void clear_feat_caps(u32 *bitmap,
 
 	if (cap < 0 || cap > 127) {
 		wcn36xx_warn("error cap idx %d", cap);
-	} else {
-		arr_idx = cap / 32;
-		bit_idx = cap % 32;
-		bitmap[arr_idx] &= ~(1 << bit_idx);
+		return;
 	}
+
+	arr_idx = cap / 32;
+	bit_idx = cap % 32;
+	bitmap[arr_idx] &= ~(1 << bit_idx);
 }
 
 int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn)
-- 
1.8.2.2




More information about the wcn36xx mailing list