From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965716AbcIVRjG (ORCPT ); Thu, 22 Sep 2016 13:39:06 -0400 Received: from mout.web.de ([212.227.15.4]:50149 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965366AbcIVRiz (ORCPT ); Thu, 22 Sep 2016 13:38:55 -0400 Subject: [PATCH 06/14] GPU-DRM-TTM: Rename a jump label in ttm_dma_pool_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:38:42 +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:wAwN4/00Z1K0HlSduOsBoOr9vIAJ8aXRDe/HzKI/tLzv/IUC1/4 vhg03nDn+QUiuaf9nXjfSr+QVWT6OSxadllIBlbBJUGvC4dUblFL5Wj/Z0bCxyYmxNC9GwH 4Fm6RAMTy2p9VzQQTqUsRrw1dFI6p66YmAVOSGlHe8numFG99+0d24EMIEeuI72+d/gdl4a rL2KX2e4t8siOcGoRM00A== X-UI-Out-Filterresults: notjunk:1;V01:K0:8UM4Myk93xY=:XgFT9NDNsGn4gqg7RvZIb3 eDEK2oDd9tgq4HwfaALYdM8+fryB8sJaz2ZCbOX3A311FoAwju7pZRTxb7/nkmoaMI5QSwIDN DjMRBJZhRF+u/SFQgJ2swGHiMMURVDpliXjQoPVh0ZQqD0uT01kB8ot5VEZEKdBPAar8MWrxS K47uu8eEwTHZyz0FIQjgv+hXgbOoktCVeQ59KoBpdwkA04NjGiFdnpA8FH+Y+M13TQ+a+UAnQ hb4yzlNosAg/S3/aqXhQrmhHII91GUktUr11h44EpuVYw1HAisWmxS/r8brdlsmlPybHCXSuc 2chT+C6/9Gc4lxDGuG46TxJ2EwFoqyUrbGBiTsOjzUz04ANtlE/Qkq8YlaLlMoq1m/nyOFDxw AzeClYRJoFK2alQqC6YONz2rpzjwk1W/v1jQKlf9kvweS2PvoRGK+2nMOAuFIMh9xkzmAmWIa ruoHhkL/zqiE2le2k2tP+FMd5Ziq+p5Ydmc10Vw36X4d/70ydaDoI+8eHu/5u5UYGPmjuCOT9 jvpQ1N1h/dpuWfLMalcBcqEKSGVXlYbry90UTarYm/rcmAez5IhMBc9qSceXOoIxPltg5WIcf HST/4TG2WAOfv7inanEThKrKInc/+tB1RiIlRjdk3oeMO6JnKogUp99NtsxHqN1IRWXQRtmML R/l4gxqbPevdWeeLc4/wAq29SAxpWEwJ0uhfJrlhy6J1vLEf0v5+SxE8867iLAr1Hk90PMOY8 6JnrSyp0LvvX0h5R8qH4PWyW8O26h2gRZe7EVhdCtS6eD3uAsdPlNZ0Jvq4eaAmevuDQaXBGM 97Ilytj 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:54:12 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 194818d..9dc1632 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -758,7 +758,7 @@ static int ttm_dma_pool_alloc_new_pages(struct dma_pool *pool, cpages); } r = -ENOMEM; - goto out; + goto free_array; } p = dma_p->p; #ifdef CONFIG_HIGHMEM @@ -777,7 +777,7 @@ static int ttm_dma_pool_alloc_new_pages(struct dma_pool *pool, ttm_dma_handle_caching_state_failure( pool, d_pages, caching_array, cpages); - goto out; + goto free_array; } cpages = 0; } @@ -791,7 +791,7 @@ static int ttm_dma_pool_alloc_new_pages(struct dma_pool *pool, ttm_dma_handle_caching_state_failure(pool, d_pages, caching_array, cpages); } -out: + free_array: kfree(caching_array); return r; } -- 2.10.0