From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965716AbcIERAe (ORCPT ); Mon, 5 Sep 2016 13:00:34 -0400 Received: from mout.web.de ([212.227.17.11]:59597 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965322AbcIERA3 (ORCPT ); Mon, 5 Sep 2016 13:00:29 -0400 Subject: [PATCH 13/21] ACPI-video: Improve a jump target in acpi_video_switch_brightness() To: linux-acpi@vger.kernel.org, Hans de Goede , Len Brown , "Rafael J. Wysocki" , Zhang Rui References: <566ABCD9.1060404@users.sourceforge.net> <897ebf36-2fe5-e109-adf6-b81b6e863d9a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: <786e4156-5316-1313-7ac1-45e646be2776@users.sourceforge.net> Date: Mon, 5 Sep 2016 19:00:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <897ebf36-2fe5-e109-adf6-b81b6e863d9a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:gf2Cz19ehKEi2Ajv9/VhDIzWlQL+wH95wYcJTuZOhEwl9QJwAAo EBPdTKFNuqQn2pAEoCI1ZW9a+dqa4m2nfjR+AsN4ZCXbaEAdd4+fNWQTtITJ5MXMsW5lwuJ 8MB1vx+NVXn4QXK2ccole9Mbx+tuoLOPhPzPUnP4ofT0eZM9sXJ6afE6Or1O5H046t3dD03 mcyjZBLddsK9jDcrFyIqQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:5hn63WGdQlk=:ukaoLaHbwB/mgBWkzt32gh fxeyh92zKgbIjbg+iamCMLTGAQNQVPXmKltL7os+KDu/aT2/ZtoQhzUKL52Jup2fAwgUZgUh2 3w++XMOOrI3RxlefUFGHvdNOrlhq1TXSW5dMdBQxKFVKT30AgCBDAoxM5JXXGZkUmmZ3rtcd3 c9xFZThgwVHCnHo+irYMfVVtvbVpZylxp9d0zlth8hmDTEvsInDCBVHFtI7cHp5PN9rK/F2vD utlq7RSUcYlE46UyUHwXEtre7HcdcROHJY8EapdsIZySNEymRwtI6O0Att6COtNWlEgLtavIo El252sxtgsoNmU6Mk3aFMUZZbodzG4XqylTOcoUcygGIocbtaQmjcb2jhTQFuYKwDjAypAifj Z/n+M2ngNn11/Z3EZWCXFgqyUwIcXzeNIKbJoO7JjS8yPhoA9CktAsed0/tNfYtfwfZvnJ9QA XuQwBZ5WBnRH0f/6Ci22/j+50QdnxylHy3j5YtmOyuaVTOwa+thI9kcpm9Umk09rVZMiWO8x/ VC+quC+dAwKSrxbPV54PKE/WBgGbDIKaC8APi+dEPWe3kbXz2iimIcOKr6PRh4tCqiEa9n67M wwWzJMPZMf4UaxDpy9gWQMDlnCOjDNG5yirQvCvMCfdDeWVzpYHEmUa9+42n5IX8+/j8WqQof fOnz4aG2vbVFY5XFJII5qD91paXcuHcZ+K2o4nZ4MuPquxlRAm9C4kZqf5nVJZU0dutpq1ES1 g68ncFnlReJIfC3sOVOylAt/3yC7Mh1nXjfVYz2lHp6AhGzSuySqjzb2LdfmVSvOmVcKSmdhG OMAkAnL Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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