From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965905AbcIVRjz (ORCPT ); Thu, 22 Sep 2016 13:39:55 -0400 Received: from mout.web.de ([212.227.15.4]:59150 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965694AbcIVRjo (ORCPT ); Thu, 22 Sep 2016 13:39:44 -0400 Subject: [PATCH 07/14] GPU-DRM-TTM: Rename jump labels in ttm_dma_page_pool_free() 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:39:37 +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:b8KmjjBuPOSDP0K0QmFA68c40bnfR+KhDAertwgp9bSFxUv2Z7b iO+kqGNcxg6axWTkjf/WrYNXQsoURbsu9Vg+g9yritLx33eOzRPiDvmnST3lBBTjXXKVLeg 8B/whd0wkMbBW8yL6dO/pkzjLD+PqYyg3gT6hzK5ggRyZQkOpQ3Rl3V2CqNh+CBEBtW/aHv nhRqJIv2n49ov6rkX5Jyw== X-UI-Out-Filterresults: notjunk:1;V01:K0:9R0phbQzu4Q=:Ba0lU2lKZBx9zqy1whAvzy OXeRoSxw505HJvAnXAsEeppNq9NgkS78QHh+v6atVRrQ0Fi7wb1FwiUU6y17YrOqUPdf/h1Dm fyw3m5dMfQYS3zjvaBhrsb/j6zaEV4w5j1ln7BVX1zQwXszrWPfQeUl66wb6vrNSNkkVtaCX7 rUmx8S9pQv/K4w9QFfqMd6QMI3Ll5kCugIQ0DKLwjwpUoGpjL0mdxzK9xo43PhheClFixl+N8 YXOvG9Ar6v51DBAn8+3pon33tiZLjpSaUkCzy30/Ye2RjvnGut9CpyvbQLkQ8VYZdhjgUq4ut P6CaX2dN2f2ehN+dEVPfHDw2yPD9QZreaSiBf1WiCNZHujA+9hEv4nD52Zz8QCH+h1v6BP4Np zOTh5GRJR7S9gJgo0RE7cYV4pdsrKM0NlEtqdYfpPck9fh4IroBP7i/+yukMinyjKh97EcMi3 vxKZP49GU5c4zVul/vqo93izjf3MroijiRxnxeXBTl7DBOj1YEqO7tlAuMUYAtO68lrxbZ80p Ccqds554haO3a+ASfFu+TNvYkQSgfyIvnkmowlSuFtU391yvBIPRtO1vUHOc19ViP+5tQ7FL9 X3EL5wYCWzqZIt4VQWPFNovO+O+NeLrRpQk6EzvOm/GbnaIRSXtZ96YsU+QRVmg22n5Z8iQz1 U1yulysvghSPyAdpRjRq6CJxxd4k35lEmUS2PEij89bcve61gp0AiorWfuA0+IQCadqnTRV+O D1SN94lnmecYTt2tfyWGqGS4x3CJfybZUetJ26oeykL2Fi+6CsAqSCyq+IiIFV5KIhYFmhx+3 K/5Gobs 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 15:32:32 +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 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 9dc1632..ce3d361 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -449,7 +449,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free, return 0; } INIT_LIST_HEAD(&d_pages); -restart: + lock_restart: spin_lock_irqsave(&pool->lock, irq_flags); /* We picking the oldest ones off the list */ @@ -489,14 +489,13 @@ restart: /* free all so restart the processing */ if (nr_free) - goto restart; + goto lock_restart; /* Not allowed to fall through or break because * following context is inside spinlock while we are * outside here. */ - goto out; - + goto check_pages_to_free; } } @@ -510,7 +509,7 @@ restart: if (freed_pages) ttm_dma_pages_put(pool, &d_pages, pages_to_free, freed_pages); -out: + check_pages_to_free: if (pages_to_free != static_buf) kfree(pages_to_free); return nr_free; -- 2.10.0