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

Groups > linux.kernel > #1476803

[PATCH 04/21] ACPI-video: Rename jump labels in acpi_video_get_levels()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 5 Sep 2016 14:11:43 +0200

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

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/acpi/acpi_video.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 420d125..82987db 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -773,13 +773,13 @@ int acpi_video_get_levels(struct acpi_device *device,
 
 	if (obj->package.count < 2) {
 		result = -EINVAL;
-		goto out;
+		goto free_object;
 	}
 
 	br = kzalloc(sizeof(*br), GFP_KERNEL);
 	if (!br) {
 		result = -ENOMEM;
-		goto out;
+		goto free_object;
 	}
 
 	br->levels = kmalloc_array(obj->package.count + 2,
@@ -787,7 +787,7 @@ int acpi_video_get_levels(struct acpi_device *device,
 				   GFP_KERNEL);
 	if (!br->levels) {
 		result = -ENOMEM;
-		goto out_free;
+		goto free_brightness;
 	}
 
 	for (i = 0; i < obj->package.count; i++) {
@@ -843,13 +843,12 @@ int acpi_video_get_levels(struct acpi_device *device,
 	*dev_br = br;
 	if (pmax_level)
 		*pmax_level = max_level;
-
-out:
+ free_object:
 	kfree(obj);
 	return result;
-out_free:
+ free_brightness:
 	kfree(br);
-	goto out;
+	goto free_object;
 }
 EXPORT_SYMBOL(acpi_video_get_levels);
 
-- 
2.10.0

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

Thread

[PATCH 00/21] ACPI-video: Fine-tuning for several function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 18:50 +0200
  [PATCH 01/21] ACPI-video: Use kmalloc_array() in  acpi_video_get_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 18:50 +0200
  [PATCH 02/21] ACPI-video: Return directly after a failed device query SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 18:50 +0200
  [PATCH 08/21] ACPI-video: Improve a size determination in  acpi_video_bus_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:00 +0200
  [PATCH 07/21] ACPI-video: Rename jump labels in acpi_video_bus_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:00 +0200
  [PATCH 11/21] ACPI-video: Rename jump labels in  acpi_video_bus_add_notify_handler() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:00 +0200
  [PATCH 14/21] ACPI-video: Improve a size determination in  acpi_video_device_enumerate() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 15/21] ACPI-video: Delete an unnecessary initialisation in  acpi_video_device_enumerate() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 12/21] ACPI-video: Delete unnecessary if statement in  acpi_video_switch_brightness() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 18/21] ACPI-video: Rename jump labels in  acpi_video_init_brightness() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 13/21] ACPI-video: Improve a jump target in  acpi_video_switch_brightness() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 09/21] ACPI-video: Rename jump labels in acpi_video_register() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 16/21] ACPI-video: Rename jump labels in  acpi_video_device_enumerate() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 19/21] ACPI-video: Rename a jump label in  acpi_video_device_lcd_query_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 21/21] ACPI-video: Improve a size determination in  acpi_video_bus_get_one_device() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 10/21] ACPI-video: Return directly after a failed  input_allocate_device() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 17/21] ACPI-video: Delete an unnecessary initialisation in  acpi_video_init_brightness() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 20/21] ACPI-video: Improve a size determination in  acpi_video_dev_register_backlight() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:10 +0200
  [PATCH 04/21] ACPI-video: Rename jump labels in  acpi_video_get_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:30 +0200
  [PATCH 06/21] ACPI-video: Move four assignments in  acpi_video_get_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:30 +0200
  [PATCH 05/21] ACPI-video: Delete an unnecessary initialisation in  acpi_video_get_levels() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:30 +0200
  [PATCH 03/21] ACPI-video: Delete an error message for a failed  kzalloc() call SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-05 19:40 +0200
  Re: [PATCH 00/21] ACPI-video: Fine-tuning for several function implementations "Rafael J. Wysocki" <rafael@kernel.org> - 2016-09-05 23:50 +0200
    Re: ACPI-video: Fine-tuning for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-06 05:30 +0200
      Re: ACPI-video: Fine-tuning for several function implementations "Rafael J. Wysocki" <rafael@kernel.org> - 2016-09-06 13:30 +0200
        Re: ACPI-video: Fine-tuning for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-06 16:20 +0200
          Re: ACPI-video: Fine-tuning for several function implementations "Rafael J. Wysocki" <rafael@kernel.org> - 2016-09-06 23:10 +0200
            Re: ACPI-video: Fine-tuning for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-07 08:50 +0200

csiph-web