staging: rtl8712: remove redundant check in r871xu_drv_init
authorPavel Skripkin <paskripkin@gmail.com>
Sun, 13 Jun 2021 22:00:07 +0000 (01:00 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Jun 2021 14:48:09 +0000 (16:48 +0200)
padapter->dvobj_init is initialized rigth before
initialization check. There is no need for any
branching here.

Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Link: https://lore.kernel.org/r/d367e5f39f22af44c545f8710cc18fb00f10e66c.1623620630.git.paskripkin@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/usb_intf.c

index 64ddbd483a23b8399d888e900d25124cbc95f0a4..f270824fe1184de4b2855b6fe954fe0378a436b2 100644 (file)
@@ -379,13 +379,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)