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


Groups > linux.kernel > #1499745

[PATCH 11/34] [media] DaVinci-VPBE: Rename a jump label in vpbe_set_output()

From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 11/34] [media] DaVinci-VPBE: Rename a jump label in vpbe_set_output()
Date 2016-10-12 17:00 +0200
Message-ID <srtaG-5Pq-3@gated-at.bofh.it> (permalink)
References <srsHD-5Fa-11@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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

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


Thread

[PATCH 00/34] [media] DaVinci-Video Processing: Fine-tuning for  several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:30 +0200
  [PATCH 01/34] [media] DaVinci-VPBE: Use kmalloc_array() in  vpbe_initialize() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:30 +0200
  [PATCH 04/34] [media] DaVinci-VPBE: Combine substrings for four  messages SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:40 +0200
  [PATCH 02/34] [media] DaVinci-VPBE: Delete two error messages for a  failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:40 +0200
  [PATCH 10/34] [media] DaVinci-VPBE: Check return value of a  setup_if_config() call in vpbe_set_output() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:50 +0200
  [PATCH 09/34] [media] DaVinci-VPBE: Reduce the scope for a variable  in vpbe_set_default_output() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:50 +0200
  [PATCH 06/34] [media] DaVinci-VPBE: Return an error code only by a  single variable in vpbe_initialize() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:50 +0200
  [PATCH 08/34] [media] DaVinci-VPBE: Return the success indication  only as a constant in vpbe_set_mode() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:50 +0200
  [PATCH 07/34] [media] DaVinci-VPBE: Delete an unnecessary variable  initialisation in vpbe_initialize() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:50 +0200
  [PATCH 05/34] [media] DaVinci-VPBE: Return an error code only as a  constant in vpbe_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 16:50 +0200
  [PATCH 13/34] [media] DaVinci-VPFE-Capture: Use kmalloc_array() in  vpfe_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 12/34] [media] DaVinci-VPBE: Delete an unnecessary variable  initialisation in vpbe_set_output() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 18/34] [media] DaVinci-VPFE-Capture: Combine substrings for an  error message in vpfe_enum_input() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 15/34] [media] DaVinci-VPFE-Capture: Improve another size  determination in vpfe_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 16/34] [media] DaVinci-VPFE-Capture: Delete an unnecessary  variable initialisation in vpfe_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 11/34] [media] DaVinci-VPBE: Rename a jump label in  vpbe_set_output() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 17/34] [media] DaVinci-VPFE-Capture: Improve another size  determination in vpfe_enum_input() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:00 +0200
  [PATCH 25/34] [media] DaVinci-VPIF-Capture: Use kcalloc() in  vpif_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 20/34] [media] DaVinci-VPFE-Capture: Adjust 13 checks for null  pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 22/34] [media] DaVinci-VPFE-Capture: Move two assignments in  vpfe_s_input() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 24/34] [media] DaVinci-VPFE-Capture: Delete an unnecessary  return statement in vpfe_unregister_ccdc_device() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 19/34] [media] DaVinci-VPFE-Capture: Improve another size  determination in vpfe_open() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 28/34] [media] DaVinci-VPIF-Capture: Delete an unnecessary  variable initialisation in vpif_querystd() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 26/34] [media] DaVinci-VPIF-Capture: Delete an error message  for a failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 23/34] [media] DaVinci-VPFE-Capture: Delete unnecessary braces  in vpfe_isr() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 14/34] [media] DaVinci-VPFE-Capture: Delete three error  messages for a failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 21/34] [media] DaVinci-VPFE-Capture: Delete an unnecessary  variable initialisation in 11 functions SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:10 +0200
  [PATCH 32/34] [media] DaVinci-VPIF-Display: Adjust 11 checks for null  pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:20 +0200
  [PATCH 30/34] [media] DaVinci-VPIF-Display: Use kcalloc() in  vpif_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:20 +0200
  [PATCH 33/34] [media] DaVinci-VPIF-Display: Delete an unnecessary  variable initialisation in vpif_channel_isr() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:20 +0200
  [PATCH 31/34] [media] DaVinci-VPIF-Display: Delete an error message  for a failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:20 +0200
  [PATCH 34/34] [media] DaVinci-VPIF-Display: Delete an unnecessary  variable initialisation in process_progressive_mode() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:20 +0200
  [PATCH 29/34] [media] DaVinci-VPIF-Capture: Delete an unnecessary  variable initialisation in vpif_channel_isr() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 17:20 +0200
  [PATCH resent 03/34] [media] DaVinci-VPBE: Adjust 16 checks for null  pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 19:20 +0200
  [PATCH resent 27/34] [media] DaVinci-VPIF-Capture: Adjust ten checks  for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2016-10-12 19:20 +0200
  Re: [PATCH 00/34] [media] DaVinci-Video Processing: Fine-tuning for  several function implementations "Lad, Prabhakar" <prabhakar.csengg@gmail.com> - 2016-10-23 19:30 +0200

csiph-web