Skip to contentSkip to conversation

Staging: rtl8188eu: Remove redundant if condition

PATCH Superseded Vatika Harlalka 2 participants 2 messages Feb 23, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 Staging: rtl8188eu: Remove redundant if condition

Remove redundant if condition as !result is always false.

---
Changes in v4: Added "Staging: rtl8188eu" to commit message. Changes in v3: Removed unneeded newline after if condition to
follow kernel coding conventions.
Changes in v2: Removed {} around the outer if condition as
it has single statement.

 drivers/staging/rtl8188eu/hal/phy.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8188eu/hal/phy.c +3 -4
index 3f663fe..e005150 100644
@@ -386,19 +386,18 @@ void phy_sw_chnl(struct adapter *adapt, u8 channel)
 
 static u8 get_right_chnl_for_iqk(u8 chnl)
 {
+	u8 place;
 	u8 channel_all[ODM_TARGET_CHNL_NUM_2G_5G] = {
-		1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
 		36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64,
 		100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122,
 		124, 126, 128, 130, 132, 134, 136, 138, 140, 149, 151, 153,
 		155, 157, 159, 161, 163, 165
 	};
-	u8 place = chnl;
 
 	if (chnl > 14) {
-		for (place = 14; place < sizeof(channel_all); place++) {
+		for (place = 0; place < sizeof(channel_all); place++) {
 			if (channel_all[place] == chnl)
-				return place-13;
+				return ++place;
 		}
 	}
 	return 0;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 10 lines · Vatika Harlalka

Remove redundant if condition as !result is always false.

---
Changes in v4: Added "Staging: rtl8188eu" to commit message. Changes in v3: Removed unneeded newline after if condition to
follow kernel coding conventions.
Changes in v2: Removed {} around the outer if condition as
it has single statement.

Quoted 2 lines
 drivers/staging/rtl8188eu/hal/phy.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

The patch description here does not match the code.

Jes

Quoted 28 lines
drivers/staging/rtl8188eu/hal/phy.c +3 -4
index 3f663fe..e005150 100644
@@ -386,19 +386,18 @@ void phy_sw_chnl(struct adapter *adapt, u8 channel)
 
 static u8 get_right_chnl_for_iqk(u8 chnl)
 {
+	u8 place;
 	u8 channel_all[ODM_TARGET_CHNL_NUM_2G_5G] = {
-		1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
 		36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64,
 		100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122,
 		124, 126, 128, 130, 132, 134, 136, 138, 140, 149, 151, 153,
 		155, 157, 159, 161, 163, 165
 	};
-	u8 place = chnl;
 
 	if (chnl > 14) {
-		for (place = 14; place < sizeof(channel_all); place++) {
+		for (place = 0; place < sizeof(channel_all); place++) {
 			if (channel_all[place] == chnl)
-				return place-13;
+				return ++place;
 		}
 	}
 	return 0;