From patchwork Thu Sep 22 17:39:37 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: 9345999 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 3618E607D0 for ; Thu, 22 Sep 2016 17:39:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F0E32ABFE for ; Thu, 22 Sep 2016 17:39:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23AB02AC04; Thu, 22 Sep 2016 17:39:44 +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 906C72AC01 for ; Thu, 22 Sep 2016 17:39:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDB566E916; Thu, 22 Sep 2016 17:39:42 +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 C0A186E916 for ; Thu, 22 Sep 2016 17:39:41 +0000 (UTC) Received: from [192.168.1.2] ([77.182.99.72]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0LfidG-1bCRRQ2wag-00pOKs; Thu, 22 Sep 2016 19:39:38 +0200 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> 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> 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 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 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;