From: SF Markus Elfring <elfring@users.sourceforge.net>
To: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Jarod Wilson <jarod@redhat.com>,
Jisheng Zhang <jszhang@marvell.com>,
Mirko Lindner <mlindner@marvell.com>,
Philippe Reynes <tremyfr@gmail.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 14/25] net: mvpp2: Rename a jump label in two functions
Date: Mon, 17 Apr 2017 17:24:11 +0200 [thread overview]
Message-ID: <77376169-1cc0-c138-216e-c409948b8eb0@users.sourceforge.net> (raw)
In-Reply-To: <d6f26bba-c678-5b66-4f5d-85f56d895190@users.sourceforge.net>
From: Markus Elfring <elfring@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 <elfring@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
next prev parent reply other threads:[~2017-04-17 15:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-17 15:03 [PATCH 00/25] Ethernet-Marvell: Fine-tuning for several function implementations SF Markus Elfring
2017-04-17 15:08 ` [PATCH 01/25] net: mvneta: Use devm_kmalloc_array() in mvneta_init() SF Markus Elfring
2017-04-17 15:10 ` [PATCH 02/25] net: mvneta: Improve two size determinations " SF Markus Elfring
2017-04-17 15:13 ` [PATCH 03/25] net: mvneta: Use kmalloc_array() in mvneta_txq_init() SF Markus Elfring
2017-04-17 15:14 ` [PATCH 04/25] net: mvneta: Adjust six checks for null pointers SF Markus Elfring
2017-04-17 15:15 ` [PATCH 05/25] net: mvpp2: Use kmalloc_array() in mvpp2_txq_init() SF Markus Elfring
2017-04-17 15:16 ` [PATCH 06/25] net: mvpp2: Improve two size determinations in mvpp2_probe() SF Markus Elfring
2017-04-17 15:17 ` [PATCH 07/25] net: mvpp2: Improve another size determination in mvpp2_init() SF Markus Elfring
2017-04-17 15:18 ` [PATCH 08/25] net: mvpp2: Improve another size determination in mvpp2_port_probe() SF Markus Elfring
2017-04-17 15:19 ` [PATCH 09/25] net: mvpp2: Improve another size determination in mvpp2_bm_init() SF Markus Elfring
2017-04-17 15:20 ` [PATCH 10/25] net: mvpp2: Improve another size determination in mvpp2_prs_default_init() SF Markus Elfring
2017-04-17 15:21 ` [PATCH 11/25] net: mvpp2: Improve 27 size determinations SF Markus Elfring
2017-04-17 15:22 ` [PATCH 12/25] net: mvpp2: Improve a size determination in two functions SF Markus Elfring
2017-04-17 15:23 ` [PATCH 13/25] net: mvpp2: Fix a jump label position in mvpp2_rx() SF Markus Elfring
2017-04-17 15:24 ` SF Markus Elfring [this message]
2017-04-17 15:25 ` [PATCH 15/25] net: mvpp2: Adjust three error messages SF Markus Elfring
2017-04-17 15:26 ` [PATCH 16/25] net: mvpp2: Rename a jump label in mvpp2_tx_frag_process() SF Markus Elfring
2017-04-17 15:27 ` [PATCH 17/25] net: mvpp2: Rename a jump label in mvpp2_txq_init() SF Markus Elfring
2017-04-17 15:28 ` [PATCH 18/25] net: mvpp2: Rename a jump label in mvpp2_prs_double_vlan_add() SF Markus Elfring
2017-04-17 15:29 ` [PATCH 19/25] net: mvpp2: Rename a jump label in mvpp2_prs_vlan_add() SF Markus Elfring
2017-04-17 15:30 ` [PATCH 20/25] net: mvpp2: Adjust a null pointer check in mvpp2_egress_enable() SF Markus Elfring
2017-04-17 15:31 ` [PATCH 21/25] net: pxa168_eth: Use kcalloc() in two functions SF Markus Elfring
2017-04-17 15:32 ` [PATCH 22/25] net: pxa168_eth: Adjust four checks for null pointers SF Markus Elfring
2017-04-17 15:33 ` [PATCH 23/25] skge: Use seq_puts() in skge_debug_show() SF Markus Elfring
2017-04-17 15:34 ` [PATCH 24/25] skge: Adjust a null pointer check in skge_down() SF Markus Elfring
2017-04-17 15:35 ` [PATCH 25/25] sky2: Use seq_puts() in sky2_debug_show() SF Markus Elfring
2017-04-18 18:09 ` [PATCH 00/25] Ethernet-Marvell: Fine-tuning for several function implementations David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=77376169-1cc0-c138-216e-c409948b8eb0@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=jarod@redhat.com \
--cc=jszhang@marvell.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mlindner@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=stephen@networkplumber.org \
--cc=thomas.petazzoni@free-electrons.com \
--cc=tremyfr@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).