[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <38d7268d-4166-6df0-06fd-c66456a2d544@users.sourceforge.net>
Date: Mon, 5 Sep 2016 18:50:25 +0200
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: linux-acpi@...r.kernel.org, Hans de Goede <hdegoede@...hat.com>,
Len Brown <lenb@...nel.org>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Zhang Rui <rui.zhang@...el.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org,
Julia Lawall <julia.lawall@...6.fr>,
Paolo Bonzini <pbonzini@...hat.com>
Subject: [PATCH 04/21] ACPI-video: Rename jump labels in
acpi_video_get_levels()
From: Markus Elfring <elfring@...rs.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@...rs.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
Powered by blists - more mailing lists