From: "Bera Yüzlü" <b9788213@gmail.com>
To: gregkh@linuxfoundation.org
Cc: ethantidmore06@gmail.com, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org, "Bera Yüzlü" <b9788213@gmail.com>
Subject: [PATCH v3] staging: rtl8723bs: Improve error handling
Date: Fri, 13 Mar 2026 19:37:41 +0300 [thread overview]
Message-ID: <20260313163740.454-2-b9788213@gmail.com> (raw)
Remove unnecessary ret variable and goto exit pattern. The function now
returns immediately when an error occurs. Additionally, ensure that
intf_free_irq() is called when pm_netdev_open() fails to avoid leaving
the allocated IRQ uncleared.
Signed-off-by: Bera Yüzlü <b9788213@gmail.com>
---
V3: Fixed patch description.
V2: Used int_free_irq() in error condition.
V1 Link: https://lore.kernel.org/linux-staging/20260312131933.29505-2-b9788213@gmail.com/
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 28 ++++++++-------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 7ba689f2d..e86b8af8b 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1124,35 +1124,28 @@ static int rtw_resume_process_normal(struct adapter *padapter)
struct pwrctrl_priv *pwrpriv;
struct mlme_priv *pmlmepriv;
- int ret = _SUCCESS;
-
- if (!padapter) {
- ret = -1;
- goto exit;
- }
+ if (!padapter)
+ return -1;
pnetdev = padapter->pnetdev;
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) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS))
+ return -1;
+
rtw_hal_disable_interrupt(padapter);
/* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
- if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS)) {
- ret = -1;
- goto exit;
- }
+ if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS))
+ return -1;
rtw_reset_drv_sw(padapter);
pwrpriv->bkeepfwalive = false;
if (pm_netdev_open(pnetdev, true) != 0) {
- ret = -1;
- goto exit;
+ padapter->intf_free_irq(adapter_to_dvobj(padapter));
+ return -1;
}
netif_device_attach(pnetdev);
@@ -1168,8 +1161,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
rtw_ap_restore_network(padapter);
}
-exit:
- return ret;
+ return _SUCCESS;
}
int rtw_resume_common(struct adapter *padapter)
--
2.43.0
next reply other threads:[~2026-03-13 16:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-13 16:37 Bera Yüzlü [this message]
2026-03-16 8:25 ` [PATCH v3] staging: rtl8723bs: Improve error handling Dan Carpenter
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=20260313163740.454-2-b9788213@gmail.com \
--to=b9788213@gmail.com \
--cc=ethantidmore06@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