mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Omer El Idrissi <omer.e.idrissi@gmail.com>
To: gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
	Omer El Idrissi <omer.e.idrissi@gmail.com>
Subject: [PATCH v2 3/3] staging: rtl8723bs: clean up callees for sdio_init function
Date: Wed, 25 Mar 2026 20:06:00 +0100	[thread overview]
Message-ID: <20260325190601.7906-4-omer.e.idrissi@gmail.com> (raw)
In-Reply-To: <20260325190601.7906-1-omer.e.idrissi@gmail.com>

Let rtw_resume_process_normal return errno returned by sdio_init
instead of -1. sdio_dvobj_init returns NULL on error so leave that
as is.

Signed-off-by: Omer El Idrissi <omer.e.idrissi@gmail.com>
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 7ba689f2dfc8..e943dcea1a21 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1135,10 +1135,10 @@ static int rtw_resume_process_normal(struct adapter *padapter)
 	pwrpriv = adapter_to_pwrctl(padapter);
 	pmlmepriv = &padapter->mlmepriv;
 	/*  interface init */
-	/* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
-	if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {
-		ret = -1;
-		goto exit;
+	if (padapter->intf_init) {
+		ret = padapter->intf_init(adapter_to_dvobj(padapter));
+		if (ret)
+			goto exit;
 	}
 	rtw_hal_disable_interrupt(padapter);
 	/* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
-- 
2.51.0


  parent reply	other threads:[~2026-03-25 19:06 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-24 22:04 [PATCH 0/2] rtl8723bs: clean up error handling Omer El Idrissi
2026-03-24 22:04 ` [PATCH 1/2] staging: rtl8723bs: use direct returns in sdio_dvobj_init() Omer El Idrissi
2026-03-24 22:04 ` [PATCH 2/2] staging: rtl8723bs: cleanup return in sdio_init() Omer El Idrissi
2026-03-25  7:36   ` Dan Carpenter
2026-03-25 18:51     ` Omer
2026-03-26  7:19       ` Dan Carpenter
2026-03-25 19:05 ` [PATCH v2 0/3] clean up error handling Omer El Idrissi
2026-03-25 19:05   ` [PATCH v2 1/3] staging: rtl8723bs: use direct returns in sdio_dvobj_init() Omer El Idrissi
2026-03-25 19:05   ` [PATCH v2 2/3] staging: rtl8723bs: cleanup return in sdio_init() Omer El Idrissi
2026-03-25 19:06   ` Omer El Idrissi [this message]
2026-03-26  8:16 ` [PATCH v3 0/4] clean up error handling Omer El Idrissi
2026-03-26  8:16   ` [PATCH v3 1/4] staging: rtl8723bs: use direct returns in sdio_dvobj_init() Omer El Idrissi
2026-03-26  8:16   ` [PATCH v3 2/4] staging: rtl8723bs: cleanup return in sdio_init() Omer El Idrissi
2026-03-26  8:16   ` [PATCH v3 3/4] staging: rtl8723bs: clean up callees for sdio_init function Omer El Idrissi
2026-03-26  8:16   ` [PATCH v3 4/4] staging: rtl8723bs: Choose slightly more readable error check Omer El Idrissi
2026-03-26  8:39   ` [PATCH v3 0/4] clean up error handling Dan Carpenter
2026-03-26 10:36   ` Greg KH
2026-03-26 11:10     ` Omer
2026-03-26 14:49       ` Greg KH
2026-03-26  8:18 ` Omer El Idrissi
2026-03-26  8:18   ` [PATCH v3 1/4] staging: rtl8723bs: use direct returns in sdio_dvobj_init() Omer El Idrissi
2026-03-26  8:18   ` [PATCH v3 2/4] staging: rtl8723bs: cleanup return in sdio_init() Omer El Idrissi
2026-03-26  8:18   ` [PATCH v3 3/4] staging: rtl8723bs: clean up callees for sdio_init function Omer El Idrissi
2026-03-26  8:18   ` [PATCH v3 4/4] staging: rtl8723bs: Choose slightly more readable error check Omer El Idrissi

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=20260325190601.7906-4-omer.e.idrissi@gmail.com \
    --to=omer.e.idrissi@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    /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®