From: Pavel Skripkin Date: Sun, 13 Jun 2021 22:00:07 +0000 (+0300) Subject: staging: rtl8712: remove redundant check in r871xu_drv_init X-Git-Tag: v5.4.132~34 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=92538bf2eea884467f5c3e70c05e6f34ad582eb4;p=users%2Fdwmw2%2Flinux.git staging: rtl8712: remove redundant check in r871xu_drv_init [ Upstream commit 69d998f1e552f6e2e7b55f5058ce1ac7a72903f9 ] padapter->dvobj_init is initialized rigth before initialization check. There is no need for any branching here. Signed-off-by: Pavel Skripkin Link: https://lore.kernel.org/r/d367e5f39f22af44c545f8710cc18fb00f10e66c.1623620630.git.paskripkin@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 2fcd65260f4c1..bc421925e84c2 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -380,13 +380,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, /* step 3. * initialize the dvobj_priv */ - if (!padapter->dvobj_init) { + + status = padapter->dvobj_init(padapter); + if (status != _SUCCESS) goto error; - } else { - status = padapter->dvobj_init(padapter); - if (status != _SUCCESS) - goto error; - } + /* step 4. */ status = r8712_init_drv_sw(padapter); if (status)