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


Groups > linux.kernel > #1485700

[PATCH 07/10] firewire-net: Rename a jump label in fwnet_incoming_packet()

From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 07/10] firewire-net: Rename a jump label in fwnet_incoming_packet()
Date 2016-09-18 08:20 +0200
Message-ID <siDCh-4sb-15@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:32:14 +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 a0ccab3..7e802e7 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -621,7 +621,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 	peer = fwnet_peer_find_by_node_id(dev, source_node_id, generation);
 	if (!peer) {
 		retval = -ENOENT;
-		goto fail;
+		goto unlock;
 	}
 
 	pd = fwnet_pd_find(peer, datagram_label);
@@ -636,7 +636,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 				  dg_size, buf, fg_off, len);
 		if (pd == NULL) {
 			retval = -ENOMEM;
-			goto fail;
+			goto unlock;
 		}
 		peer->pdg_size++;
 	} else {
@@ -652,7 +652,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 			if (pd == NULL) {
 				peer->pdg_size--;
 				retval = -ENOMEM;
-				goto fail;
+				goto unlock;
 			}
 		} else {
 			if (!fwnet_pd_update(peer, pd, buf, fg_off, len)) {
@@ -664,7 +664,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 				fwnet_pd_delete(pd);
 				peer->pdg_size--;
 				retval = -ENOMEM;
-				goto fail;
+				goto unlock;
 			}
 		}
 	} /* new datagram or add to existing one */
@@ -688,7 +688,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
 	 * moment.
 	 */
 	retval = 0;
- fail:
+ unlock:
 	spin_unlock_irqrestore(&dev->lock, flags);
 
 	return retval;
-- 
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