OSDN Git Service

staging: rtl8712: init_mp_priv(): Change return values
authorNishka Dasgupta <nishkadg.linux@gmail.com>
Mon, 22 Jul 2019 09:23:38 +0000 (14:53 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jul 2019 07:52:00 +0000 (09:52 +0200)
Change return values of init_mp_priv from _SUCCESS/_FAIL to 0/-ENOMEM
respectively.
Remove label that returns the required value and return the values
directly as they are set.
Consequently remove now-unnecessary return variable.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190722092341.21030-5-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/rtl871x_mp.c

index edd3da0..1a39a96 100644 (file)
@@ -35,7 +35,7 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv)
 
 static int init_mp_priv(struct mp_priv *pmp_priv)
 {
-       int i, res;
+       int i;
        struct mp_xmit_frame *pmp_xmitframe;
 
        _init_mp_priv_(pmp_priv);
@@ -45,8 +45,7 @@ static int init_mp_priv(struct mp_priv *pmp_priv)
                                sizeof(struct mp_xmit_frame) + 4,
                                GFP_ATOMIC);
        if (!pmp_priv->pallocated_mp_xmitframe_buf) {
-               res = _FAIL;
-               goto _exit_init_mp_priv;
+               return -ENOMEM;
        }
        pmp_priv->pmp_xmtframe_buf = pmp_priv->pallocated_mp_xmitframe_buf +
                         4 -
@@ -62,9 +61,7 @@ static int init_mp_priv(struct mp_priv *pmp_priv)
                pmp_xmitframe++;
        }
        pmp_priv->free_mp_xmitframe_cnt = NR_MP_XMITFRAME;
-       res = _SUCCESS;
-_exit_init_mp_priv:
-       return res;
+       return 0;
 }
 
 static int free_mp_priv(struct mp_priv *pmp_priv)