On Fri, 13 Aug 2021 at 21:14, Nathan Chancellor <nathan@xxxxxxxxxx> wrote:
>
> ret is unnecessary as both error paths set the same error code so just
> return that directly.
>
> Suggested-by: Fabio M. De Francesco <fmdefrancesco@xxxxxxxxx>
> Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
> ---
> 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
>
Dear Nathan,
Thanks for this.
Acked-by: Phillip Potter <phil@xxxxxxxxxxxxxxxx>
Regards,
Phil
