]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: r8188eu: clean up rtw_hal_init
authorMartin Kaiser <martin@kaiser.cx>
Sun, 6 Nov 2022 12:48:58 +0000 (13:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Nov 2022 15:29:29 +0000 (16:29 +0100)
Clean up the rtw_hal_init function.

Remove the status variable. Exit immediately for errors.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221106124901.720785-7-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/hal/hal_intf.c

index 37935aef71eab131fdb366b30b36074dd71c7756..13790e32f11c2a3a36481585ef6a2f95e652c169 100644 (file)
@@ -6,24 +6,19 @@
 #include "../include/drv_types.h"
 #include "../include/hal_intf.h"
 
-uint    rtw_hal_init(struct adapter *adapt)
+uint rtw_hal_init(struct adapter *adapt)
 {
-       uint    status = _SUCCESS;
-
        adapt->hw_init_completed = false;
 
-       status = rtl8188eu_hal_init(adapt);
+       if (rtl8188eu_hal_init(adapt) != _SUCCESS)
+               return _FAIL;
 
-       if (status == _SUCCESS) {
-               adapt->hw_init_completed = true;
+       adapt->hw_init_completed = true;
 
-               if (adapt->registrypriv.notch_filter == 1)
-                       hal_notch_filter_8188e(adapt, 1);
-       } else {
-               adapt->hw_init_completed = false;
-       }
+       if (adapt->registrypriv.notch_filter == 1)
+               hal_notch_filter_8188e(adapt, 1);
 
-       return status;
+       return _SUCCESS;
 }
 
 uint rtw_hal_deinit(struct adapter *adapt)