From patchwork Thu Sep 22 17:38:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9345973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D5AF0607D0 for ; Thu, 22 Sep 2016 17:38:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE33D2ABFD for ; Thu, 22 Sep 2016 17:38:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2EF12AC04; Thu, 22 Sep 2016 17:38:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 255862ABFD for ; Thu, 22 Sep 2016 17:38:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6574E6E915; Thu, 22 Sep 2016 17:38:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.15.4]) by gabe.freedesktop.org (Postfix) with ESMTPS id 450B56E915 for ; Thu, 22 Sep 2016 17:38:47 +0000 (UTC) Received: from [192.168.1.2] ([77.182.99.72]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0MXHt7-1bQNuA2DQ5-00WG8A; Thu, 22 Sep 2016 19:38:43 +0200 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> 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> 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 Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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; }