From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 09/13] staging: rtl8188eu: simplify rtl88eu_mon_init
Date: Sun, 20 Jun 2021 19:52:57 +0200 [thread overview]
Message-ID: <20210620175301.14988-9-martin@kaiser.cx> (raw)
In-Reply-To: <20210620175301.14988-1-martin@kaiser.cx>
The code looks a bit nicer without goto.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/os_dep/mon.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8188eu/os_dep/mon.c b/drivers/staging/rtl8188eu/os_dep/mon.c
index 9b40de7d39e7..6370a3d8881b 100644
--- a/drivers/staging/rtl8188eu/os_dep/mon.c
+++ b/drivers/staging/rtl8188eu/os_dep/mon.c
@@ -163,18 +163,15 @@ struct net_device *rtl88eu_mon_init(void)
dev = alloc_netdev(0, "mon%d", NET_NAME_UNKNOWN, mon_setup);
if (!dev)
- goto fail;
+ return NULL;
err = register_netdev(dev);
- if (err < 0)
- goto fail_free_dev;
+ if (err < 0) {
+ free_netdev(dev);
+ return NULL;
+ }
return dev;
-
-fail_free_dev:
- free_netdev(dev);
-fail:
- return NULL;
}
void rtl88eu_mon_deinit(struct net_device *dev)
--
2.20.1
next prev parent reply other threads:[~2021-06-20 17:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 17:52 [PATCH 01/13] staging: rtl8188eu: handle errors from dev_alloc_name Martin Kaiser
2021-06-20 17:52 ` [PATCH 02/13] staging: rtl8188eu: remove RT_TRACE prints from usb_intf.c Martin Kaiser
2021-06-20 17:52 ` [PATCH 03/13] staging: rtl8188eu: remove RT_TRACE prints from rtl8188e_hal_init.c Martin Kaiser
2021-06-20 17:52 ` [PATCH 04/13] staging: rtl8188eu: remove a couple of unused defines Martin Kaiser
2021-06-20 17:52 ` [PATCH 05/13] staging: rtl8188eu: remove efuse type Martin Kaiser
2021-06-20 17:52 ` [PATCH 06/13] staging: rtl8188eu: remove unnecessary if clause Martin Kaiser
2021-06-20 17:52 ` [PATCH 07/13] staging: rtl8188eu: remove RT_TRACE and MSG_88E prints from usb_halinit.c Martin Kaiser
2021-06-20 17:52 ` [PATCH 08/13] staging: rtl8188eu: remove HAL_INIT_PROFILE_TAG Martin Kaiser
2021-06-20 17:52 ` Martin Kaiser [this message]
2021-06-20 17:52 ` [PATCH 10/13] staging: rtl8188eu: remove RT_TRACE prints from pwrseqcmd.c Martin Kaiser
2021-06-20 17:52 ` [PATCH 11/13] staging: rtl8188eu: make efuse_ReadEFuse static Martin Kaiser
2021-06-20 17:53 ` [PATCH 12/13] staging: rtl8188eu: remove sdio defines Martin Kaiser
2021-06-20 17:53 ` [PATCH 13/13] staging: rtl8188eu: remove more unused defines Martin Kaiser
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=20210620175301.14988-9-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).