public inbox for linux-kernel@vger.kernel.org
 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 6/9] staging: rtl8188eu: refactor if else statement
Date: Fri, 23 Nov 2018 21:41:03 +0100	[thread overview]
Message-ID: <20181123204106.2284-6-straube.linux@gmail.com> (raw)
In-Reply-To: <20181123204106.2284-1-straube.linux@gmail.com>

Refactor if else statement to clear checkpatch warnings.
WARNING: else is not generally useful after a break or return
WARNING: line over 80 characters

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/rtl8188eu/core/rtw_mlme.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index 9cc7d5b8293c..513b6d89a0de 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -1758,12 +1758,9 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_
 	}
 
 	iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);
-	if (iEntry < 0) {
-		return ielength;
-	} else {
-		if (authmode == _WPA2_IE_ID_)
-			ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
-	}
+	if (iEntry >= 0 && authmode == _WPA2_IE_ID_)
+		ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength);
+
 	return ielength;
 }
 
-- 
2.19.2


  parent reply	other threads:[~2018-11-23 20:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-23 20:40 [PATCH 1/9] staging: rtl8188eu: cleanup remaining comparsions to true Michael Straube
2018-11-23 20:40 ` [PATCH 2/9] staging: rtl8188eu: remove unnecessary parentheses in rtw_mlme.c Michael Straube
2018-11-23 20:41 ` [PATCH 3/9] staging: rtl8188eu: use __func__ " Michael Straube
2018-11-23 20:41 ` [PATCH 4/9] staging: rtl8188eu: remove rtw_android_set_block() Michael Straube
2018-11-23 20:41 ` [PATCH 5/9] staging: rtl8188eu: cleanup declarations in rtw_mlme.c Michael Straube
2018-11-23 20:41 ` Michael Straube [this message]
2018-11-23 20:41 ` [PATCH 7/9] staging: rtl8188eu: remove return from void function Michael Straube
2018-11-23 20:41 ` [PATCH 8/9] staging: rtl8188eu: correct indentation Michael Straube
2018-11-23 20:41 ` [PATCH 9/9] staging: rtl8188eu: cleanup lines over 80 characters 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=20181123204106.2284-6-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