From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756332AbcIRGNR (ORCPT ); Sun, 18 Sep 2016 02:13:17 -0400 Received: from mout.web.de ([217.72.192.78]:53529 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753880AbcIRGNJ (ORCPT ); Sun, 18 Sep 2016 02:13:09 -0400 Subject: [PATCH 02/10] firewire-net: Rename a jump label in fwnet_broadcast_start() To: linux1394-devel@lists.sourceforge.net, Stefan Richter References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <1f06a795-8595-9f3d-7eb3-28c9d6c5289c@users.sourceforge.net> Date: Sun, 18 Sep 2016 08:12:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:O36fS7uokZu/I3wwnxpwW4DcluFHWvWZkryTAldhFWri2ZitE4K AQfdPNCZDLp4f5AhgoFwdHUlWSsaXJKNuIRp2v4zs88CdXIBGGgkFxF1vU3pbMvMlN5texJ X2aoy29/6DUt/4+whXd7ntDVjKwquYHszcYltnf+47H3h6BTlyTgzqdwxz1rAnDbezgz61V KTP9KkXI6OKpq6sUQc4Pg== X-UI-Out-Filterresults: notjunk:1;V01:K0:0scs1KWwXBk=:bWU7hsfGwybzgWi28IrIGd HneqXumTBet+cd7fO6q1MyRCw/O7fQh9XLo4ksE5PQDYav6mfjlb1gv4D4rmeOFBF7a5Sap5S i8x4A6CovL8Nja4vHpYOL9bJ/BVWTd/iGKHSMMxX5aZVUm/2ZhAFzqxqkhs2TRElLfGO5W6h+ jvTE+VFshyAYlRLMqMZP4Rt3zmAqvrnmaq89tr1e2diFaaz7lMgmMhvXmpZTpmD3Fwqjp8UQn Pe1rze7AXf4iUpr69T59bxfOjg9X3ezBCrSBVXGgv2uMM0nFsN2Yxn+61Moy9bPOGwJ5Gab5N j1oc2FBtsdj2vuw/XFZbqDkTvChtiQwW/8lNgJ4wZdNutvsBpADPGPnivZU/MVadlFF7XA2PV K6OWb3opR2966zpoqUTT5jR5/aYhnAtDaRSlRduhJH0IcZNRtPqWUAmxeMXjS/x09mUpfX9eX l/uUU4P2JLk5sNEGj3Ydq2Wrhz3DHPMvHSBOayNKv1xRoVFBirifuMcouoiVA+CW3WUauVO5A 1l/OhG2tdx3LzwZrDoEF8ztrtSF+Lwc6oyA59DQeabFcWs2bBearoX/jR54OaNxJXU8elBDgs j0fdEHLBu9bZFoIQPM2DeNPnwoC7ilLVhhZeImKSAAGoTdnL61FqfapLsd69tVpYHI5iQiZ5l jHe+XzVJ0+tJv/rKzf+8YtRIGSM9nvovQhv+eKzWbojyhOilTZYtNUyPUYr8vYi1/ZDuXzuQt quZMQMiNd/E/0F8HCPkXYF3+TA/4+V/81lXmQz0/T9rzi45k7VtMD9pJAHQHK6ur5cBYmRurp 1njQ8WK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 17 Sep 2016 22:02:44 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/firewire/net.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 7911f13..89afed3 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -1106,7 +1106,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) ptrptr = kmalloc_array(num_packets, sizeof(*ptrptr), GFP_KERNEL); if (!ptrptr) { retval = -ENOMEM; - goto failed; + goto stop_broadcast; } dev->broadcast_rcv_buffer_ptrs = ptrptr; @@ -1116,13 +1116,13 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) fwnet_receive_broadcast, dev); if (IS_ERR(context)) { retval = PTR_ERR(context); - goto failed; + goto stop_broadcast; } retval = fw_iso_buffer_init(&dev->broadcast_rcv_buffer, dev->card, FWNET_ISO_PAGE_COUNT, DMA_FROM_DEVICE); if (retval < 0) - goto failed; + goto stop_broadcast; dev->broadcast_state = FWNET_BROADCAST_STOPPED; @@ -1148,7 +1148,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) retval = fw_iso_context_queue(context, &packet, &dev->broadcast_rcv_buffer, offset); if (retval < 0) - goto failed; + goto stop_broadcast; offset += max_receive; } @@ -1158,7 +1158,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) retval = fw_iso_context_start(context, -1, 0, FW_ISO_CONTEXT_MATCH_ALL_TAGS); /* ??? sync */ if (retval < 0) - goto failed; + goto stop_broadcast; /* FIXME: adjust it according to the min. speed of all known peers? */ dev->broadcast_xmt_max_payload = IEEE1394_MAX_PAYLOAD_S100 @@ -1166,8 +1166,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) dev->broadcast_state = FWNET_BROADCAST_RUNNING; return 0; - - failed: + stop_broadcast: __fwnet_broadcast_stop(dev); return retval; } -- 2.10.0