[PATCH 14/25] net: mvpp2: Rename a jump label in two functions

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Mon, 17 Apr 2017 11:10:47 +0200

Adjust jump labels according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/net/ethernet/marvell/mvpp2.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2.c 
b/drivers/net/ethernet/marvell/mvpp2.c
index 4f4b659d7297..89237abf386d 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -6065,7 +6065,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, 
void *p)
 
        if (!is_valid_ether_addr(addr->sa_data)) {
                err = -EADDRNOTAVAIL;
-               goto error;
+               goto log_error;
        }
 
        if (!netif_running(dev)) {
@@ -6075,7 +6075,7 @@ static int mvpp2_set_mac_address(struct net_device *dev, 
void *p)
                /* Reconfigure parser to accept the original MAC address */
                err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);
                if (err)
-                       goto error;
+                       goto log_error;
        }
 
        mvpp2_stop_dev(port);
@@ -6087,14 +6087,13 @@ static int mvpp2_set_mac_address(struct net_device 
*dev, void *p)
        /* Reconfigure parser accept the original MAC address */
        err = mvpp2_prs_update_mac_da(dev, dev->dev_addr);
        if (err)
-               goto error;
+               goto log_error;
 out_start:
        mvpp2_start_dev(port);
        mvpp2_egress_enable(port);
        mvpp2_ingress_enable(port);
        return 0;
-
-error:
+log_error:
        netdev_err(dev, "fail to change MAC address\n");
        return err;
 }
@@ -6120,7 +6119,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int 
mtu)
                /* Reconfigure BM to the original MTU */
                err = mvpp2_bm_update_mtu(dev, dev->mtu);
                if (err)
-                       goto error;
+                       goto log_error;
        }
 
        mvpp2_stop_dev(port);
@@ -6134,7 +6133,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int 
mtu)
        /* Reconfigure BM to the original MTU */
        err = mvpp2_bm_update_mtu(dev, dev->mtu);
        if (err)
-               goto error;
+               goto log_error;
 
 out_start:
        mvpp2_start_dev(port);
@@ -6142,8 +6141,7 @@ static int mvpp2_change_mtu(struct net_device *dev, int 
mtu)
        mvpp2_ingress_enable(port);
 
        return 0;
-
-error:
+log_error:
        netdev_err(dev, "fail to change MTU\n");
        return err;
 }
-- 
2.12.2