LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Nathan Chancellor <nathan@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Phillip Potter <phil@philpotter.co.uk>,
Larry Finger <Larry.Finger@lwfinger.net>
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>,
"Fabio M . De Francesco" <fmdefrancesco@gmail.com>
Subject: [PATCH] staging: r8188eu: Remove unnecessary ret variable in rtw_drv_init()
Date: Fri, 13 Aug 2021 13:14:18 -0700 [thread overview]
Message-ID: <20210813201418.4018631-1-nathan@kernel.org> (raw)
ret is unnecessary as both error paths set the same error code so just
return that directly.
Suggested-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
drivers/staging/r8188eu/os_dep/usb_intf.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 667f41125a87..3e5f4b5eb0fc 100644
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -705,22 +705,18 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
{
struct adapter *if1 = NULL;
struct dvobj_priv *dvobj;
- int ret;
/* step 0. */
process_spec_devid(pdid);
/* Initialize dvobj_priv */
dvobj = usb_dvobj_init(pusb_intf);
- if (!dvobj) {
- ret = -ENODEV;
+ if (!dvobj)
goto err;
- }
if1 = rtw_usb_if1_init(dvobj, pusb_intf);
if (!if1) {
DBG_88E("rtw_init_primarystruct adapter Failed!\n");
- ret = -ENODEV;
goto free_dvobj;
}
@@ -734,7 +730,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
free_dvobj:
usb_dvobj_deinit(pusb_intf);
err:
- return ret;
+ return -ENODEV;
}
/*
base-commit: 0bd35146642bdc56f1b87d75f047b1c92bd2bd39
--
2.33.0.rc2
next reply other threads:[~2021-08-13 20:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 20:14 Nathan Chancellor [this message]
2021-08-13 21:55 ` Fabio M. De Francesco
2021-08-14 17:16 ` Phillip Potter
2021-08-16 9:05 ` Dan Carpenter
2021-08-16 10:15 ` Fabio M. De Francesco
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=20210813201418.4018631-1-nathan@kernel.org \
--to=nathan@kernel.org \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--subject='Re: [PATCH] staging: r8188eu: Remove unnecessary ret variable in rtw_drv_init()' \
/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
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).