From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938713AbcIER3D (ORCPT ); Mon, 5 Sep 2016 13:29:03 -0400 Received: from mout.web.de ([212.227.17.11]:58343 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935081AbcIEQuq (ORCPT ); Mon, 5 Sep 2016 12:50:46 -0400 Subject: [PATCH 04/21] ACPI-video: Rename jump labels in acpi_video_get_levels() 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: <38d7268d-4166-6df0-06fd-c66456a2d544@users.sourceforge.net> Date: Mon, 5 Sep 2016 18:50:25 +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:zOPyjai7FP8p4/AEL7YJyPqkLU2sCKOYZvInoZ36xDCifmzi1T0 ydeyp2i0yO6bDXq73zb6dlCAytQvZ2q/swAXyWjv4gn2MKosN/00ZnGU85kvX6wpJoNBLWd Ufvj0ro4scU/Q4PwGUB3hqdKnMltW4rMEg2V8S81DJhgSRnN6WZ2DUgN8Hci4Fr4+3yJnv4 zn3Q4ecpW/ZiekounLzBw== X-UI-Out-Filterresults: notjunk:1;V01:K0:m8rSLJxNxVo=:VGLF1w8PC+zTlNTwNomYkW 53MUoZ7rizjLaxCNHodKjM4UeXTzGBbre9tB5xyK9RlGKt7o7TYWab4q8CAvZlai2Xl+Ragg+ cJ2WtzJB1cIO9rsS2657uWiJr+tz37U/RA6S5eb8ni+z5XR7XFyFvjf0mitrpQyaFarULc63q LgokujMaS9hvYXfPNzEHLX6dISU3sM6z2mAxOvqFGjHCGgwH7qNzpbygqDy7pSCJh7isuhelI tSwn3kg2S33DnciJY0SlAnAORpmCfqbATZFvFxavzKkBtV4nXVKbYNOQ7lB2vFWz3mCjXuK5h B9MymC264Pcxqo2ju55FrpeT4NtQO4HzFVq9FmtxUKR7HzFBhGVMrYMq+1EtRoeT4CnIQQOxW 9lEP6UeJ/82iSRdoioV1cTJ1J5i+pw1Lv7Au0qz5php/ArTMrFi36B5Zl/T2ZRjUXrHfcy/fm 5xiwACRsEPr22h1mdK4y9Zh3rk5RbcH+lJwMUYpAIYoh6DsNlJQDcWV5zsCHdFAIcwgpRWMT/ nL3pfRCdpOFkobskKPz6fEX9Mgqb1omnXeYb856yj7jliGzAuR4v1gAsnnxw5XJyQMlZUk87S q3upPSvXgQI0SPn7MpuxFhFkg5MbEJY4449kY3jhg3gIu2Oybn/2yvRHePTmemiwpyb14P8oK cg+ECck3HRwK9oc/Jelng5+D9Bh4e+4KkeyyCWbIrF6TFYfwD7JynQ3JfCWcu/ewmmF7M2hj4 +SPDEgahOB9l7saJdWN6OJ4ORoUZRG9pDJy94iLXZTp477cGIzX3+Zw2GhgXq9kC+owE7U+Kp 7MJBOi+ 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 14:11:43 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- 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