From: Michael Straube <straube.linux@gmail.com>
Date: Thu, 12 Jul 2018 10:36:07 +0000 (+0200)
Subject: staging: rtl8723bs: refactor rtw_is_cckrates_included()
X-Git-Tag: v4.19-rc1~101^2~507
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c53578cd0ba8251304560c818c558b32a23217aa;p=thirdparty%2Fkernel%2Flinux.git

staging: rtl8723bs: refactor rtw_is_cckrates_included()

Refactor rtw_is_cckrates_included() to improve readability and
slightly reduce object file size.

Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 3f1c7bb0eb9f0..3adb58759d5ff 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -68,13 +68,12 @@ int rtw_get_bit_value_from_ieee_value(u8 val)
 
 uint rtw_is_cckrates_included(u8 *rate)
 {
-	u32 i = 0;
+	while (*rate) {
+		u8 r = *rate & 0x7f;
 
-	while (rate[i] !=  0) {
-		if  ((((rate[i]) & 0x7f) == 2)	|| (((rate[i]) & 0x7f) == 4) ||
-		     (((rate[i]) & 0x7f) == 11)  || (((rate[i]) & 0x7f) == 22))
+		if (r == 2 || r == 4 || r == 11 || r == 22)
 			return true;
-		i++;
+		rate++;
 	}
 
 	return false;