linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-media@vger.kernel.org,
	Hans Verkuil <hans.verkuil@cisco.com>,
	"Lad, Prabhakar" <prabhakar.csengg@gmail.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	kernel-janitors@vger.kernel.org,
	Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH 11/34] [media] DaVinci-VPBE: Rename a jump label in vpbe_set_output()
Date: Wed, 12 Oct 2016 16:48:38 +0200	[thread overview]
Message-ID: <0fb1a9a0-cf02-51a1-6fe7-6d7be501e0d9@users.sourceforge.net> (raw)
In-Reply-To: <a99f89f2-a3be-9b5f-95c1-e0912a7d78f3@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 12 Oct 2016 10:10:19 +0200

Adjust jump labels according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/media/platform/davinci/vpbe.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 6e7b0df..e68a792 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -253,20 +253,20 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)
 		sd_index = vpbe_find_encoder_sd_index(cfg, index);
 		if (sd_index < 0) {
 			ret = -EINVAL;
-			goto out;
+			goto unlock;
 		}
 
 		ret = venc_device->setup_if_config(cfg
 						   ->outputs[index].if_params);
 		if (ret)
-			goto out;
+			goto unlock;
 	}
 
 	/* Set output at the encoder */
 	ret = v4l2_subdev_call(vpbe_dev->encoders[sd_index], video,
 				       s_routing, 0, enc_out_index, 0);
 	if (ret)
-		goto out;
+		goto unlock;
 
 	/*
 	 * It is assumed that venc or extenal encoder will set a default
@@ -288,7 +288,7 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)
 		vpbe_dev->current_sd_index = sd_index;
 		vpbe_dev->current_out_index = index;
 	}
-out:
+unlock:
 	mutex_unlock(&vpbe_dev->lock);
 	return ret;
 }
-- 
2.10.1

  parent reply	other threads:[~2016-10-12 14:55 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-12 14:26 [PATCH 00/34] [media] DaVinci-Video Processing: Fine-tuning for several function implementations SF Markus Elfring
2016-10-12 14:29 ` [PATCH 01/34] [media] DaVinci-VPBE: Use kmalloc_array() in vpbe_initialize() SF Markus Elfring
2016-10-12 14:30 ` [PATCH 02/34] [media] DaVinci-VPBE: Delete two error messages for a failed memory allocation SF Markus Elfring
2016-10-12 14:34 ` [PATCH 04/34] [media] DaVinci-VPBE: Combine substrings for four messages SF Markus Elfring
2016-10-12 14:35 ` [PATCH 05/34] [media] DaVinci-VPBE: Return an error code only as a constant in vpbe_probe() SF Markus Elfring
2016-10-12 14:40 ` [PATCH 06/34] [media] DaVinci-VPBE: Return an error code only by a single variable in vpbe_initialize() SF Markus Elfring
2016-11-16 14:30   ` Mauro Carvalho Chehab
2016-10-12 14:42 ` [PATCH 07/34] [media] DaVinci-VPBE: Delete an unnecessary variable initialisation " SF Markus Elfring
2016-11-16 14:35   ` Mauro Carvalho Chehab
2016-10-12 14:43 ` [PATCH 08/34] [media] DaVinci-VPBE: Return the success indication only as a constant in vpbe_set_mode() SF Markus Elfring
2016-10-12 14:44 ` [PATCH 09/34] [media] DaVinci-VPBE: Reduce the scope for a variable in vpbe_set_default_output() SF Markus Elfring
2016-10-12 14:47 ` [PATCH 10/34] [media] DaVinci-VPBE: Check return value of a setup_if_config() call in vpbe_set_output() SF Markus Elfring
2016-11-03 12:20   ` Hans Verkuil
2016-11-03 20:54     ` SF Markus Elfring
2016-11-04  8:06       ` Hans Verkuil
2016-11-06 20:00         ` [PATCH v2 " SF Markus Elfring
2016-10-12 14:48 ` SF Markus Elfring [this message]
2016-10-12 14:50 ` [PATCH 12/34] [media] DaVinci-VPBE: Delete an unnecessary variable initialisation " SF Markus Elfring
2016-10-12 14:51 ` [PATCH 13/34] [media] DaVinci-VPFE-Capture: Use kmalloc_array() in vpfe_probe() SF Markus Elfring
2016-10-12 14:52 ` [PATCH 14/34] [media] DaVinci-VPFE-Capture: Delete three error messages for a failed memory allocation SF Markus Elfring
2016-10-12 14:53 ` [PATCH 15/34] [media] DaVinci-VPFE-Capture: Improve another size determination in vpfe_probe() SF Markus Elfring
2016-10-12 14:54 ` [PATCH 16/34] [media] DaVinci-VPFE-Capture: Delete an unnecessary variable initialisation " SF Markus Elfring
2016-10-12 14:55 ` [PATCH 17/34] [media] DaVinci-VPFE-Capture: Improve another size determination in vpfe_enum_input() SF Markus Elfring
2016-11-03 12:22   ` Hans Verkuil
2016-11-03 21:05     ` SF Markus Elfring
2016-11-04  8:06       ` Hans Verkuil
2016-11-06 21:00         ` [PATCH v2 17/34] [media] DaVinci-VPFE-Capture: Replace a memcpy() call by an assignment " SF Markus Elfring
2016-10-12 14:56 ` [PATCH 18/34] [media] DaVinci-VPFE-Capture: Combine substrings for an error message " SF Markus Elfring
2016-10-12 14:57 ` [PATCH 19/34] [media] DaVinci-VPFE-Capture: Improve another size determination in vpfe_open() SF Markus Elfring
2016-10-12 14:58 ` [PATCH 20/34] [media] DaVinci-VPFE-Capture: Adjust 13 checks for null pointers SF Markus Elfring
2016-10-12 14:59 ` [PATCH 21/34] [media] DaVinci-VPFE-Capture: Delete an unnecessary variable initialisation in 11 functions SF Markus Elfring
2016-10-12 15:00 ` [PATCH 22/34] [media] DaVinci-VPFE-Capture: Move two assignments in vpfe_s_input() SF Markus Elfring
2016-10-12 15:01 ` [PATCH 23/34] [media] DaVinci-VPFE-Capture: Delete unnecessary braces in vpfe_isr() SF Markus Elfring
2016-10-12 15:02 ` [PATCH 24/34] [media] DaVinci-VPFE-Capture: Delete an unnecessary return statement in vpfe_unregister_ccdc_device() SF Markus Elfring
2016-10-12 15:03 ` [PATCH 25/34] [media] DaVinci-VPIF-Capture: Use kcalloc() in vpif_probe() SF Markus Elfring
2016-10-12 15:04 ` [PATCH 26/34] [media] DaVinci-VPIF-Capture: Delete an error message for a failed memory allocation SF Markus Elfring
2016-10-12 15:07 ` [PATCH 28/34] [media] DaVinci-VPIF-Capture: Delete an unnecessary variable initialisation in vpif_querystd() SF Markus Elfring
2016-10-12 15:08 ` [PATCH 29/34] [media] DaVinci-VPIF-Capture: Delete an unnecessary variable initialisation in vpif_channel_isr() SF Markus Elfring
2016-10-12 15:10 ` [PATCH 30/34] [media] DaVinci-VPIF-Display: Use kcalloc() in vpif_probe() SF Markus Elfring
2016-10-12 15:12 ` [PATCH 31/34] [media] DaVinci-VPIF-Display: Delete an error message for a failed memory allocation SF Markus Elfring
2016-10-12 15:13 ` [PATCH 32/34] [media] DaVinci-VPIF-Display: Adjust 11 checks for null pointers SF Markus Elfring
2016-10-12 15:14 ` [PATCH 33/34] [media] DaVinci-VPIF-Display: Delete an unnecessary variable initialisation in vpif_channel_isr() SF Markus Elfring
2016-10-12 15:15 ` [PATCH 34/34] [media] DaVinci-VPIF-Display: Delete an unnecessary variable initialisation in process_progressive_mode() SF Markus Elfring
     [not found] ` <fdf72877-08a9-1a86-aec8-627a378258da@users.sourceforge.net>
2016-10-12 17:15   ` [PATCH resent 03/34] [media] DaVinci-VPBE: Adjust 16 checks for null pointers SF Markus Elfring
     [not found] ` <73a8bc6c-3dc5-c152-7b59-fd1a5e84f61c@users.sourceforge.net>
2016-10-12 17:16   ` [PATCH resent 27/34] [media] DaVinci-VPIF-Capture: Adjust ten " SF Markus Elfring
2016-10-23 17:26 ` [PATCH 00/34] [media] DaVinci-Video Processing: Fine-tuning for several function implementations Lad, Prabhakar

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=0fb1a9a0-cf02-51a1-6fe7-6d7be501e0d9@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=hans.verkuil@cisco.com \
    --cc=julia.lawall@lip6.fr \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=prabhakar.csengg@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).