staging: r8188eu: remove unnecessary return labels.
authorMichael Straube <straube.linux@gmail.com>
Thu, 8 Sep 2022 13:09:15 +0000 (15:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Sep 2022 07:53:01 +0000 (09:53 +0200)
Remove the RETURN labels in rtw_alloc_etherdev_with_old_priv() and
rtw_alloc_etherdev() and return directly to clean up the code and
improve readability.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220908130915.8406-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/os_dep/osdep_service.c

index 3504a0a..875a416 100644 (file)
@@ -54,14 +54,13 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv,
 
        pnetdev = alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4);
        if (!pnetdev)
-               goto RETURN;
+               return NULL;
 
        pnetdev->dev.type = &wlan_type;
        pnpi = netdev_priv(pnetdev);
        pnpi->priv = old_priv;
        pnpi->sizeof_priv = sizeof_priv;
 
-RETURN:
        return pnetdev;
 }
 
@@ -72,19 +71,18 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv)
 
        pnetdev = alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4);
        if (!pnetdev)
-               goto RETURN;
+               return NULL;
 
        pnpi = netdev_priv(pnetdev);
 
        pnpi->priv = vzalloc(sizeof_priv);
        if (!pnpi->priv) {
                free_netdev(pnetdev);
-               pnetdev = NULL;
-               goto RETURN;
+               return NULL;
        }
 
        pnpi->sizeof_priv = sizeof_priv;
-RETURN:
+
        return pnetdev;
 }