]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: rtl8723bs: use direct returns in sdio_dvobj_init()
authorOmer El Idrissi <omer.e.idrissi@gmail.com>
Thu, 26 Mar 2026 09:36:06 +0000 (10:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Mar 2026 08:34:05 +0000 (10:34 +0200)
Make sdio_dvobj_init() use direct returns

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

index d664e254912cf35ea8dba3e8d3d082644b99b323..358eac0837cf7c37f6304fbfa0356303b7cee06a 100644 (file)
@@ -155,13 +155,12 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
 }
 static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
 {
-       int status = _FAIL;
        struct dvobj_priv *dvobj = NULL;
        struct sdio_data *psdio;
 
        dvobj = devobj_init();
        if (!dvobj)
-               goto exit;
+               return NULL;
 
        sdio_set_drvdata(func, dvobj);
 
@@ -172,18 +171,14 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
                goto free_dvobj;
 
        rtw_reset_continual_io_error(dvobj);
-       status = _SUCCESS;
 
-free_dvobj:
-       if (status != _SUCCESS && dvobj) {
-               sdio_set_drvdata(func, NULL);
+       return dvobj;
 
-               devobj_deinit(dvobj);
+free_dvobj:
+       sdio_set_drvdata(func, NULL);
+       devobj_deinit(dvobj);
 
-               dvobj = NULL;
-       }
-exit:
-       return dvobj;
+       return NULL;
 }
 
 static void sdio_dvobj_deinit(struct sdio_func *func)