mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
	Phillip Potter <phil@philpotter.co.uk>,
	Michael Straube <straube.linux@gmail.com>,
	Pavel Skripkin <paskripkin@gmail.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
	Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 6/9] staging: r8188eu: clean up rtw_hal_init
Date: Sun,  6 Nov 2022 13:48:58 +0100	[thread overview]
Message-ID: <20221106124901.720785-7-martin@kaiser.cx> (raw)
In-Reply-To: <20221106124901.720785-1-martin@kaiser.cx>

Clean up the rtw_hal_init function.

Remove the status variable. Exit immediately for errors.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/hal/hal_intf.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 37935aef71ea..13790e32f11c 100644
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -6,24 +6,19 @@
 #include "../include/drv_types.h"
 #include "../include/hal_intf.h"
 
-uint	 rtw_hal_init(struct adapter *adapt)
+uint rtw_hal_init(struct adapter *adapt)
 {
-	uint	status = _SUCCESS;
-
 	adapt->hw_init_completed = false;
 
-	status = rtl8188eu_hal_init(adapt);
+	if (rtl8188eu_hal_init(adapt) != _SUCCESS)
+		return _FAIL;
 
-	if (status == _SUCCESS) {
-		adapt->hw_init_completed = true;
+	adapt->hw_init_completed = true;
 
-		if (adapt->registrypriv.notch_filter == 1)
-			hal_notch_filter_8188e(adapt, 1);
-	} else {
-		adapt->hw_init_completed = false;
-	}
+	if (adapt->registrypriv.notch_filter == 1)
+		hal_notch_filter_8188e(adapt, 1);
 
-	return status;
+	return _SUCCESS;
 }
 
 uint rtw_hal_deinit(struct adapter *adapt)
-- 
2.30.2


  parent reply	other threads:[~2022-11-06 12:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-06 12:48 [PATCH 0/9] staging: r8188eu: another round of cleanups Martin Kaiser
2022-11-06 12:48 ` [PATCH 1/9] staging: r8188eu: don't store addba request Martin Kaiser
2022-11-06 12:48 ` [PATCH 2/9] staging: r8188eu: remove some obsolete comments Martin Kaiser
2022-11-06 12:48 ` [PATCH 3/9] staging: r8188eu: reorder assignments, clarify the header format Martin Kaiser
2022-11-06 12:48 ` [PATCH 4/9] staging: r8188eu: reformat a function header Martin Kaiser
2022-11-06 12:48 ` [PATCH 5/9] staging: r8188eu: remove state checks in rtw_led_control Martin Kaiser
2022-11-06 12:48 ` Martin Kaiser [this message]
2022-11-06 12:48 ` [PATCH 7/9] staging: r8188eu: remove get_fwstate Martin Kaiser
2022-11-06 12:49 ` [PATCH 8/9] staging: r8188eu: merge two rtw_free_network_nolock functions Martin Kaiser
2022-11-06 12:49 ` [PATCH 9/9] staging: r8188eu: remove checks in dump_mgntframe Martin Kaiser
2022-11-07  6:22 ` [PATCH 0/9] staging: r8188eu: another round of cleanups Philipp Hortmann

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=20221106124901.720785-7-martin@kaiser.cx \
    --to=martin@kaiser.cx \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=paskripkin@gmail.com \
    --cc=phil@philpotter.co.uk \
    --cc=straube.linux@gmail.com \
    /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

all inboxes | Powered by JetHome®