* [PATCH 2/4] staging: r8188eu: convert rtw_is_cckrates_included() to bool
2021-08-16 9:58 [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included() Michael Straube
@ 2021-08-16 9:58 ` Michael Straube
2021-08-16 9:58 ` [PATCH 3/4] staging: r8188eu: refactor rtw_is_cckratesonly_included() Michael Straube
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2021-08-16 9:58 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging,
linux-kernel, Michael Straube
Function rtw_is_cckrates_included() returns boolean values.
Change the return type to bool to reflect this.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_ieee80211.c | 2 +-
drivers/staging/r8188eu/include/ieee80211.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c
index beff2ab73a1a..c8627ad83006 100644
--- a/drivers/staging/r8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c
@@ -68,7 +68,7 @@ int rtw_get_bit_value_from_ieee_value(u8 val)
return 0;
}
-uint rtw_is_cckrates_included(u8 *rate)
+bool rtw_is_cckrates_included(u8 *rate)
{
while (*rate) {
u8 r = *rate & 0x7f;
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index bc5b030e9c40..cbefd7af1d4f 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -1206,7 +1206,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv);
int rtw_get_bit_value_from_ieee_value(u8 val);
-uint rtw_is_cckrates_included(u8 *rate);
+bool rtw_is_cckrates_included(u8 *rate);
uint rtw_is_cckratesonly_included(u8 *rate);
--
2.32.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] staging: r8188eu: refactor rtw_is_cckratesonly_included()
2021-08-16 9:58 [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included() Michael Straube
2021-08-16 9:58 ` [PATCH 2/4] staging: r8188eu: convert rtw_is_cckrates_included() to bool Michael Straube
@ 2021-08-16 9:58 ` Michael Straube
2021-08-16 9:58 ` [PATCH 4/4] staging: r8188eu: convert rtw_is_cckratesonly_included() to bool Michael Straube
2021-08-16 11:14 ` [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included() Joe Perches
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2021-08-16 9:58 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging,
linux-kernel, Michael Straube
Refactor function rtw_is_cckratesonly_included(). Improves readability
and slightly reduces object file size.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_ieee80211.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c
index c8627ad83006..200c90b8ea51 100644
--- a/drivers/staging/r8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c
@@ -82,15 +82,13 @@ bool rtw_is_cckrates_included(u8 *rate)
uint rtw_is_cckratesonly_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 false;
- i++;
+ rate++;
}
-
return true;
}
--
2.32.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] staging: r8188eu: convert rtw_is_cckratesonly_included() to bool
2021-08-16 9:58 [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included() Michael Straube
2021-08-16 9:58 ` [PATCH 2/4] staging: r8188eu: convert rtw_is_cckrates_included() to bool Michael Straube
2021-08-16 9:58 ` [PATCH 3/4] staging: r8188eu: refactor rtw_is_cckratesonly_included() Michael Straube
@ 2021-08-16 9:58 ` Michael Straube
2021-08-16 11:14 ` [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included() Joe Perches
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2021-08-16 9:58 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging,
linux-kernel, Michael Straube
Function rtw_is_cckratesonly_included() returns boolean values.
Change the return type to bool to reflect this.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_ieee80211.c | 2 +-
drivers/staging/r8188eu/include/ieee80211.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c
index 200c90b8ea51..fdbedc99f798 100644
--- a/drivers/staging/r8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c
@@ -80,7 +80,7 @@ bool rtw_is_cckrates_included(u8 *rate)
return false;
}
-uint rtw_is_cckratesonly_included(u8 *rate)
+bool rtw_is_cckratesonly_included(u8 *rate)
{
while (*rate) {
u8 r = *rate & 0x7f;
diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index cbefd7af1d4f..1205d13171b2 100644
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -1207,8 +1207,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv);
int rtw_get_bit_value_from_ieee_value(u8 val);
bool rtw_is_cckrates_included(u8 *rate);
-
-uint rtw_is_cckratesonly_included(u8 *rate);
+bool rtw_is_cckratesonly_included(u8 *rate);
int rtw_check_network_type(unsigned char *rate, int ratelen, int channel);
--
2.32.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included()
2021-08-16 9:58 [PATCH 1/4] staging: r8188eu: refactor rtw_is_cckrates_included() Michael Straube
` (2 preceding siblings ...)
2021-08-16 9:58 ` [PATCH 4/4] staging: r8188eu: convert rtw_is_cckratesonly_included() to bool Michael Straube
@ 2021-08-16 11:14 ` Joe Perches
3 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2021-08-16 11:14 UTC (permalink / raw)
To: Michael Straube, gregkh
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging, linux-kernel
On Mon, 2021-08-16 at 11:58 +0200, Michael Straube wrote:
> Refactor function rtw_is_cckrates_included(). Improves readability
> and slightly reduces object file size.
[]
> diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c
[]
> @@ -70,13 +70,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;
> }
Bikeshed:
More compact code with only 1 reference of rate not 3 is more
readable to at least me.
u8 r;
while ((r = *rate++ & 0x7f)) {
if (r == 2 || r == 4 || r == 11 || r == 22)
return true;
}
return false;
And you might make a static inline for the test of r so it could
be reused in the rtw_is_cckratesonly_included function
static inline bool is_cckrate(u8 rate)
{
return rate == 2 || rate == 4 || rate == 11 || rate == 22;
}
so this could be:
u8 r;
while ((r = *rate++ & 0x7f)) {
if (is_cckrate(r))
return true;
}
return false;
^ permalink raw reply [flat|nested] 5+ messages in thread