From: Saurav Girepunje <saurav.girepunje@gmail.com>
To: gregkh@linuxfoundation.org, fabioaiuto83@gmail.com,
ross.schm.dev@gmail.com, marcocesati@gmail.com,
insafonov@gmail.com, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org
Cc: saurav.girepunje@hotmail.com
Subject: [PATCH] staging: rtl8723bs: os_dep: simplify the return statement.
Date: Sat, 9 Oct 2021 21:09:12 +0530 [thread overview]
Message-ID: <YWG3oIchovDZnPl8@user> (raw)
Remove the unneeded and redundant check of variable on goto out.
Simplify the return using multiple goto label to avoid
unneeded check.
Signed-off-by: Saurav Girepunje <saurav.girepunje@gmail.com>
---
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 29 ++++++++++---------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 0868f56e2979..574fdb6adce7 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -2282,18 +2282,18 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
if (!name) {
ret = -EINVAL;
- goto out;
+ goto err_out;
}
if (pwdev_priv->pmon_ndev) {
ret = -EBUSY;
- goto out;
+ goto err_out;
}
mon_ndev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator));
if (!mon_ndev) {
ret = -ENOMEM;
- goto out;
+ goto err_out;
}
mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
if (!mon_wdev) {
ret = -ENOMEM;
- goto out;
+ goto err_zmalloc;
}
mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,22 +2322,23 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
ret = cfg80211_register_netdevice(mon_ndev);
if (ret) {
- goto out;
+ goto err_register;
}
*ndev = pwdev_priv->pmon_ndev = mon_ndev;
memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
-out:
- if (ret && mon_wdev) {
- kfree(mon_wdev);
- mon_wdev = NULL;
- }
+err_register:
- if (ret && mon_ndev) {
- free_netdev(mon_ndev);
- *ndev = mon_ndev = NULL;
- }
+ kfree(mon_wdev);
+ mon_wdev = NULL;
+
+err_zmalloc:
+
+ free_netdev(mon_ndev);
+ *ndev = mon_ndev = NULL;
+
+err_out:
return ret;
}
--
2.32.0
next reply other threads:[~2021-10-09 15:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-09 15:39 Saurav Girepunje [this message]
2021-10-09 16:59 ` [PATCH] staging: rtl8723bs: os_dep: simplify the return statement Fabio M. De Francesco
2021-10-09 18:17 ` Saurav Girepunje
2021-10-11 12:26 ` Dan Carpenter
2021-10-11 18:26 ` Saurav Girepunje
2021-10-12 6:34 ` 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=YWG3oIchovDZnPl8@user \
--to=saurav.girepunje@gmail.com \
--cc=fabioaiuto83@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=insafonov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=marcocesati@gmail.com \
--cc=ross.schm.dev@gmail.com \
--cc=saurav.girepunje@hotmail.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;
as well as URLs for NNTP newsgroup(s).