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 v3 1/4] staging: rtl8723bs: use direct returns in sdio_dvobj_init()
Date: Thu, 26 Mar 2026 09:18:25 +0100 [thread overview]
Message-ID: <20260326081828.6314-2-omer.e.idrissi@gmail.com> (raw)
In-Reply-To: <20260326081828.6314-1-omer.e.idrissi@gmail.com>
Make sdio_dvobj_init() use direct returns
Signed-off-by: Omer El Idrissi <omer.e.idrissi@gmail.com>
---
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index d664e254912c..358eac0837cf 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -155,13 +155,12 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
}
static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
{
- int status = _FAIL;
struct dvobj_priv *dvobj = NULL;
struct sdio_data *psdio;
dvobj = devobj_init();
if (!dvobj)
- goto exit;
+ return NULL;
sdio_set_drvdata(func, dvobj);
@@ -172,18 +171,14 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
goto free_dvobj;
rtw_reset_continual_io_error(dvobj);
- status = _SUCCESS;
-free_dvobj:
- if (status != _SUCCESS && dvobj) {
- sdio_set_drvdata(func, NULL);
+ return dvobj;
- devobj_deinit(dvobj);
+free_dvobj:
+ sdio_set_drvdata(func, NULL);
+ devobj_deinit(dvobj);
- dvobj = NULL;
- }
-exit:
- return dvobj;
+ return NULL;
}
static void sdio_dvobj_deinit(struct sdio_func *func)
--
2.51.0
next prev parent reply other threads:[~2026-03-26 8:18 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 ` [PATCH v2 3/3] staging: rtl8723bs: clean up callees for sdio_init function Omer El Idrissi
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 ` Omer El Idrissi [this message]
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=20260326081828.6314-2-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®