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

SF Markus Elfring
2016-09-05T16:50:25Z

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