staging: rtl8723bs: cleanup return in sdio_init()

Make sdio_init() return errno from sdio_enable_func or
sdio_set_block_size instead of _SUCCESS/_FAIL vendor-defined
macros. Let rtw_resume_process_normal return errno returned by
sdio_init instead of -1. sdio_dvobj_init returns NULL on error
so leave that as is. Let sdio_dvobj_init use a slightly more
readable and conventional error check for sdio_init().

Signed-off-by: Omer El Idrissi <omer.e.idrissi@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/20260326093607.13011-3-omer.e.idrissi@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 7ba689f2dfc889fe3ec0e1b4b432783c0c623185..e943dcea1a21ba8d909dfaec2013144f0093d9a3 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1135,10 +1135,10 @@ static int rtw_resume_process_normal(struct adapter *padapter)
        pwrpriv = adapter_to_pwrctl(padapter);
        pmlmepriv = &padapter->mlmepriv;
        /*  interface init */
-       /* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
-       if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {
-               ret = -1;
-               goto exit;
+       if (padapter->intf_init) {
+               ret = padapter->intf_init(adapter_to_dvobj(padapter));
+               if (ret)
+                       goto exit;
        }
        rtw_hal_disable_interrupt(padapter);
        /* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 358eac0837cf7c37f6304fbfa0356303b7cee06a..d0feb28b7043e2fdc5fe6c41da31120f05f74a53 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -131,9 +131,7 @@ static u32 sdio_init(struct dvobj_priv *dvobj)
 release:
        sdio_release_host(func);
 
-       if (err)
-               return _FAIL;
-       return _SUCCESS;
+       return err;
 }
 
 static void sdio_deinit(struct dvobj_priv *dvobj)
@@ -157,6 +155,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
 {
        struct dvobj_priv *dvobj = NULL;
        struct sdio_data *psdio;
+       int ret;
 
        dvobj = devobj_init();
        if (!dvobj)
@@ -167,7 +166,8 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
        psdio = &dvobj->intf_data;
        psdio->func = func;
 
-       if (sdio_init(dvobj) != _SUCCESS)
+       ret = sdio_init(dvobj);
+       if (ret)
                goto free_dvobj;
 
        rtw_reset_continual_io_error(dvobj);