[PATCH 13/21] ACPI-video: Improve a jump target in acpi_video_switch_brightness()

SF Markus Elfring
2016-09-05T17:00:34Z

Date: Mon, 5 Sep 2016 16:34:08 +0200

* Avoid another duplicate check for the local variable "result"
then at the end.

* Jump directly to an error message in the case that the desired brightness
can not be switched.

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

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 0362a43..fe10d3f 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -1361,19 +1361,19 @@ acpi_video_switch_brightness(struct work_struct *work)
return;

if (!device->brightness)
- goto out;
+ goto report_failure;

result = acpi_video_device_lcd_get_level_current(device,
&level_current,
false);
if (result)
- goto out;
+ goto report_failure;

level_next = acpi_video_get_next_level(device, level_current, event);

result = acpi_video_device_lcd_set_level(device, level_next);
-out:
if (result)
+ report_failure:
printk(KERN_ERR PREFIX "Failed to switch the brightness\n");
else
backlight_force_update(device->backlight,
--
2.10.0