From a4adfa836c5289df905af19edc9727fc275dc1a1 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Fri, 13 Aug 2021 13:14:18 -0700 Subject: [PATCH] staging: r8188eu: Remove unnecessary ret variable in rtw_drv_init() ret is unnecessary as both error paths set the same error code so just return that directly. Suggested-by: Fabio M. De Francesco Reviewed-by: Fabio M. De Francesco Acked-by: Phillip Potter Signed-off-by: Nathan Chancellor Link: https://lore.kernel.org/r/20210813201418.4018631-1-nathan@kernel.org Signed-off-by: Greg Kroah-Hartman --- 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 667f41125a87f..3e5f4b5eb0fcd 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; } /* -- 2.30.2