From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966799AbcIVTXx (ORCPT ); Thu, 22 Sep 2016 15:23:53 -0400 Received: from mout.web.de ([212.227.15.4]:62336 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935749AbcIVRfE (ORCPT ); Thu, 22 Sep 2016 13:35:04 -0400 Subject: [PATCH 02/14] GPU-DRM-TTM: Rename a jump label in ttm_alloc_new_pages() To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Emil Velikov References: <566ABCD9.1060404@users.sourceforge.net> <4d34446f-05ad-c3ce-5d33-8fb4f25af25c@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Thu, 22 Sep 2016 19:34:55 +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: <4d34446f-05ad-c3ce-5d33-8fb4f25af25c@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:9Pk/zKeqXhywC5QvKA9A07J8X8YbkEt1BzbJjWe7XpHy2goCADo IiJRMK4J/qJg5hf4ZD5MB0YkIj26FJxyAyE0uzBrJzeB9ddgOX/gzTjpUG4ZcIlcScxiY6v NNYMcBSeShey3XEIMBfJsrtrbCF1+OJAA19JX+R/6jWxKVakEhByVXxwYtj6UL696dJWDxk serKx+AnqJBLkg1VdpE9w== X-UI-Out-Filterresults: notjunk:1;V01:K0:vMlrGg5Qz3Y=:xzbMh6Kz8TT2QIyQ+HSKav 1b/YtkKKh+1oI3kwwfnDs+knvV3vwQJ1tQTJvH05ZP+N9nHoL1mFZo0cHmnG7bux1E8+GA4hs VdW1AOyZRIFCdFJ97g64MLX5ROo4lpjon+NH5P++RoQulcGTZ9Tgy/x9C+805Gu/DOROt6vUo ppnQI9p0Se5GNSqWlu5QbXif4poev01QZAx1BNjsLCo8eEXEZ1AyD1uOUB0UONL1SWbVIGw1/ +DsW2cJE/DmAIo0ezMtfUgWQJSvsunPiMI8zwrlr1TAwSYuCTZWi1HDEGfsYzAbGEG8SlH0no Qy6/oRqMnbEbbhsaQYEHjnNTNwsINZ6OR7sOSDy7Lvb3S1hh7KzA8fXldqtSMl1OduEmsLwYD ICQ7w8I5x7IWZdtLDG5MaefdD1Wxl0y6BydVH7feayfuH3Kl7Y73KDBGJxofSHBwLYLusHd/9 zLnYJvHpasmAzMgBbZPtvBd20O0LUr8KNvNKNEKDrrt2V7Lhvie/JJDhgC/6NQ2DeTvAqX53G h1d33/rTvDrvQSHTT8L8JQ2v0V5sUxiYva11eC2R85IItC9Nn5P7s8CuVoB4XoS3vdCGSdXoj tZuItLLrkccZH5UqfIfhs4Vk0UEle5jE8+uMrGYwyeed6rurKk9N6+WZ+ALLHtLbFPIGlSyIu MmPYWcs9Wu4+gcfdXgNYdE+YejtCxpq8zfqohfqeLg56ywMYKWfa4AoP8qbTwXArhuKJertyj XKkBVjsdMA1JNb2WEkCzInECF4X9YEOZ3bU8dDuHkFGSGCyygE+1qK1yIOzgssbOuEturzo8+ pEbyQmE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 22 Sep 2016 14:16:05 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index bfc51cb..13fdd19 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -527,7 +527,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, caching_array, cpages); } r = -ENOMEM; - goto out; + goto free_array; } #ifdef CONFIG_HIGHMEM @@ -546,7 +546,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, ttm_handle_caching_state_failure(pages, ttm_flags, cstate, caching_array, cpages); - goto out; + goto free_array; } cpages = 0; } @@ -562,7 +562,7 @@ static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags, ttm_flags, cstate, caching_array, cpages); } -out: + free_array: kfree(caching_array); return r; -- 2.10.0