staging: r8188eu: clean up error handling in rtw_start_drv_threads()

Convert the error handling in the function rtw_start_drv_threads() to
the common logic used in the kernel. Another step to get rid of _FAIL
and _SUCCESS which uses inverted logic.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221106133443.8872-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/osdep_intf.h b/drivers/staging/r8188eu/include/osdep_intf.h
index 0f7d74a3ff6dfb73a3ba7f71ad968f98913f46b6..6d66cb57225e7a7984683491dacb120cb56988a5 100644 (file)
--- a/drivers/staging/r8188eu/include/osdep_intf.h
+++ b/drivers/staging/r8188eu/include/osdep_intf.h
@@ -46,7 +46,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter);
 void rtw_free_drv_sw(struct adapter *padapter);
 void rtw_reset_drv_sw(struct adapter *padapter);
 
-u32 rtw_start_drv_threads(struct adapter *padapter);
+int rtw_start_drv_threads(struct adapter *padapter);
 void rtw_stop_drv_threads (struct adapter *padapter);
 void rtw_cancel_all_timer(struct adapter *padapter);
 

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 970f380bac9614f0e631302d5eb53bedb3fbbcb7..66556e07ed93d5719600fabe3353ad0f29aa6a75 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -363,18 +363,16 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
        return pnetdev;
 }
 
-u32 rtw_start_drv_threads(struct adapter *padapter)
+int rtw_start_drv_threads(struct adapter *padapter)
 {
-       u32 _status = _SUCCESS;
-
        padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");
        if (IS_ERR(padapter->cmdThread))
-               _status = _FAIL;
-       else
-               /* wait for rtw_cmd_thread() to start running */
-               wait_for_completion(&padapter->cmdpriv.start_cmd_thread);
+               return PTR_ERR(padapter->cmdThread);
 
-       return _status;
+       /* wait for rtw_cmd_thread() to start running */
+       wait_for_completion(&padapter->cmdpriv.start_cmd_thread);
+
+       return 0;
 }
 
 void rtw_stop_drv_threads(struct adapter *padapter)
@@ -627,8 +625,7 @@ static int _netdev_open(struct net_device *pnetdev)
 
                netdev_dbg(pnetdev, "MAC Address = %pM\n", pnetdev->dev_addr);
 
-               status = rtw_start_drv_threads(padapter);
-               if (status == _FAIL) {
+               if (rtw_start_drv_threads(padapter)) {
                        pr_info("Initialize driver software resource Failed!\n");
                        goto netdev_open_error;
                }