Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1485696

[PATCH 04/10] firewire-net: Rename jump labels in fwnet_probe()

From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 04/10] firewire-net: Rename jump labels in fwnet_probe()
Date 2016-09-18 08:20 +0200
Message-ID <siDCh-4sb-9@gated-at.bofh.it> (permalink)
References <qEuGl-43C-5@gated-at.bofh.it> <siDsB-4oB-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 22:17:12 +0200

Adjust jump labels according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/firewire/net.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index cedfade..2ca2d57 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1442,7 +1442,7 @@ static int fwnet_probe(struct fw_unit *unit,
 	dev = fwnet_dev_find(card);
 	if (dev) {
 		net = dev->netdev;
-		goto have_dev;
+		goto add_peer;
 	}
 
 	net = alloc_netdev(sizeof(*dev), "firewire%d", NET_NAME_UNKNOWN,
@@ -1469,7 +1469,7 @@ static int fwnet_probe(struct fw_unit *unit,
 
 	ret = fwnet_fifo_start(dev);
 	if (ret < 0)
-		goto out;
+		goto stop_fifo;
 	dev->local_fifo = dev->handler.offset;
 
 	/*
@@ -1492,17 +1492,17 @@ static int fwnet_probe(struct fw_unit *unit,
 
 	ret = register_netdev(net);
 	if (ret)
-		goto out;
+		goto stop_fifo;
 
 	list_add_tail(&dev->dev_link, &fwnet_device_list);
 	dev_notice(&net->dev, "IP over IEEE 1394 on card %s\n",
 		   dev_name(card->device));
- have_dev:
+ add_peer:
 	ret = fwnet_add_peer(dev, unit, device);
 	if (ret && allocated_netdev) {
 		unregister_netdev(net);
 		list_del(&dev->dev_link);
- out:
+ stop_fifo:
 		fwnet_fifo_stop(dev);
 		free_netdev(net);
 	}
-- 
2.10.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/10] firewire-net: Fine-tuning for several function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:10 +0200
  [PATCH 03/10] firewire-net: Rename jump labels in fwnet_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 04/10] firewire-net: Rename jump labels in fwnet_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 02/10] firewire-net: Rename a jump label in  fwnet_broadcast_start() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 06/10] firewire-net: Rename a jump label in  fwnet_send_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 07/10] firewire-net: Rename a jump label in  fwnet_incoming_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 01/] firewire-net: Use kmalloc_array() in  fwnet_broadcast_start() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 09/10] firewire-net: Rename jump labels in fwnet_pd_new() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
  [PATCH 08/10] firewire-net: Rename a jump label in  fwnet_finish_incoming_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
  [PATCH 10/10] firewire-net: Adjust checks for null pointers in five  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200

csiph-web