can: vxcan: Use common error handling code in vxcan_newlink()

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c
index 8404e8852a0f96df80d7cb3d1059e64890405949..5d1753cfacea255567efb1892e7d883d513bbaec 100644 (file)
--- a/drivers/net/can/vxcan.c
+++ b/drivers/net/can/vxcan.c
@@ -227,10 +227,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
        netif_carrier_off(peer);
 
        err = rtnl_configure_link(peer, ifmp);
-       if (err < 0) {
-               unregister_netdevice(peer);
-               return err;
-       }
+       if (err < 0)
+               goto unregister_network_device;
 
        /* register first device */
        if (tb[IFLA_IFNAME])
@@ -239,10 +237,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
                snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
 
        err = register_netdevice(dev);
-       if (err < 0) {
-               unregister_netdevice(peer);
-               return err;
-       }
+       if (err < 0)
+               goto unregister_network_device;
 
        netif_carrier_off(dev);
 
@@ -254,6 +250,10 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
        rcu_assign_pointer(priv->peer, dev);
 
        return 0;
+
+unregister_network_device:
+       unregister_netdevice(peer);
+       return err;
 }
 
 static void vxcan_dellink(struct net_device *dev, struct list_head *head)