OSDN Git Service

staging: rtl8723bs: refactor rtw_is_cckrates_included()
authorMichael Straube <straube.linux@gmail.com>
Thu, 12 Jul 2018 10:36:07 +0000 (12:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Jul 2018 09:41:52 +0000 (11:41 +0200)
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>
drivers/staging/rtl8723bs/core/rtw_ieee80211.c

index 3f1c7bb..3adb587 100644 (file)
@@ -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;