linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
	Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 02/12] staging: rtl8188eu: refactor cckratesonly_included()
Date: Wed,  5 Dec 2018 18:02:37 +0100	[thread overview]
Message-ID: <20181205170247.5401-2-straube.linux@gmail.com> (raw)
In-Reply-To: <20181205170247.5401-1-straube.linux@gmail.com>

Refactor cckratesonly_included() to improve readability and slightly
reduce object file size. Also change the return type to bool.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c   | 10 +++++-----
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index 90160d5fc292..fac1c1c20b2f 100644
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -69,16 +69,16 @@ bool cckrates_included(unsigned char *rate, int ratelen)
 	return false;
 }
 
-int cckratesonly_included(unsigned char *rate, int ratelen)
+bool cckratesonly_included(unsigned char *rate, int ratelen)
 {
-	int	i;
+	int i;
 
 	for (i = 0; i < ratelen; i++) {
-		if  ((((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
-			   (((rate[i]) & 0x7f) != 11)  && (((rate[i]) & 0x7f) != 22))
+		u8 r = rate[i] & 0x7f;
+
+		if (r != 2 && r != 4 && r != 11 && r != 22)
 			return false;
 	}
-
 	return true;
 }
 
diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index c86dec12dec2..0ade33df16d2 100644
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -581,7 +581,7 @@ void addba_timer_hdl(struct timer_list *t);
 		  msecs_to_jiffies(ms))
 
 bool cckrates_included(unsigned char *rate, int ratelen);
-int cckratesonly_included(unsigned char *rate, int ratelen);
+bool cckratesonly_included(unsigned char *rate, int ratelen);
 
 void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr);
 
-- 
2.19.2


  reply	other threads:[~2018-12-05 17:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-05 17:02 [PATCH 01/12] staging: rtl8188eu: refactor cckrates_included() Michael Straube
2018-12-05 17:02 ` Michael Straube [this message]
2018-12-05 17:02 ` [PATCH 03/12] staging: rtl8188eu: simplify array initializations Michael Straube
2018-12-05 17:02 ` [PATCH 04/12] staging: rtl8188eu: remove unnecessary parentheses in rtw_wlan_util.c Michael Straube
2018-12-05 17:02 ` [PATCH 05/12] staging: rtl8188eu: cleanup declarations " Michael Straube
2018-12-05 17:02 ` [PATCH 06/12] staging: rtl8188eu: cleanup block comment " Michael Straube
2018-12-05 17:02 ` [PATCH 07/12] staging: rtl8188eu: cleanup long lines " Michael Straube
2018-12-05 17:02 ` [PATCH 08/12] staging: rtl8188eu: add spaces around operators " Michael Straube
2018-12-05 17:02 ` [PATCH 09/12] staging: rtl8188eu: write out multiplying in wifirate2_ratetbl_inx() Michael Straube
2018-12-05 17:02 ` [PATCH 10/12] staging: rtl8188eu: correct indentation in update_wireless_mode() Michael Straube
2018-12-05 17:37   ` Joe Perches
2018-12-05 18:36     ` Michael Straube
2018-12-05 17:02 ` [PATCH 11/12] staging: rtl8188eu: rename struct field Wifi_Error_Status Michael Straube
2018-12-05 17:02 ` [PATCH 12/12] staging: rtl8188eu: remove unused code in rtw_cmd.c Michael Straube

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181205170247.5401-2-straube.linux@gmail.com \
    --to=straube.linux@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).