From patchwork Thu Sep 22 17:36: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: 9345935 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 B9AB46077A for ; Thu, 22 Sep 2016 17:36:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B319F2ABFC for ; Thu, 22 Sep 2016 17:36:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7E1C2ABFE; Thu, 22 Sep 2016 17:36: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 3E55E2ABFC for ; Thu, 22 Sep 2016 17:36:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8435A6E3B7; Thu, 22 Sep 2016 17:36:43 +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.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2238A6E3B7 for ; Thu, 22 Sep 2016 17:36:41 +0000 (UTC) Received: from [192.168.1.2] ([77.182.99.72]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0MIvJx-1bpbxv2elN-002WQZ; Thu, 22 Sep 2016 19:36:38 +0200 Subject: [PATCH 04/14] GPU-DRM-TTM: Rename a jump label in ttm_page_pool_get_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:36: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:VhfXoOcI2SScb3XYdg1PYXvNZHerPSH3nK5296JnD+iGrd9ZVK1 FPDqJdbNFY+vcRtz3rpZ0ukbLt+vYYndKVF+0tz49KRx5bPKYMeRtsQuXIMlpqes1MXjW7W 5ToNnBUA4dvDQaOjKJJZIy3ZV3Zhupiq0psm5iwlaF6FkMhlthWJgre7UBf3neCioPCwcIM ojbjw2WqV7sBT/zRnOhQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:tIUOK5Jp/yM=:9LEsin1Y2kuhjdWYEvGf/X +jYA+nwyeN+LoCsTNvQ3NmPvOOuQHsnxtBJPSJkwtj7/CcskjCiuGW4kFgprNz/wYJAyQYSc9 UbLA6JGLw/+op9NHZUXScZduxv7UnSb1HYRt+KZ41lqNubYZ/SunZ/4jALUlSKkY4RpIJKAoC t3LvER7rnl3QsGtXZ1w4JJ9sq46lhWhZtHntLCx/2MLJgpOSMVZ5Ceaa2VjijwXxL/nGRDzSg 3eoViuwCj/OhcCZJRZ2iLWlB9kigN9h16/ZmYzkvQ4vqsMqpLw/bM3X3LDkiiyPoRVQos8G+W +7476oUyv/YtPiwBhYV5YczwwDaFiTIah8pnW8I5gXUFlPxjH2/gVNf/p8tZIx+jCkUcNRJD1 dCiS4d2uks/dIqlra64+mblaMc5RPp6OUPLDUZ31bgRPD60fl9Okps7hk05rKJvyiVyqe/C5j lZpAXE9/YGXwYA8V6ZeMKadj/21T1w9d8tqs2AYkUU8clN58SXFkve4g7oSGaPD/3et9d89+o W+t3XTTyr/r8t8iWkO5yPA0Sd1IAlUaUyJqJVPSQHQlTudDYPeNexxfk+J8GgaqRWDfR/MPDJ /6ZvjNfCnsIoRw7fYh3wVhloiTU/fvillbOSTMbzHza0UkV/Q0e1CPRKwDqfhopTB5+TNV70L VbAYrKkFAsWIwjngzYA7oZE/fwMPR/QSOLHJrXgTFVJms/+XB9B2N9xbl0D89zttXgQVwUqgC 4pwpiiIt42HDm7q1eGds/EteYpLLe01AlhwQCItm0xZbT/rcv2kIaiVN/9RlfuKuNjLUzgMFf C+EyaC2 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:36:47 +0200 Adjust a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index f33f6f6..3dd603f 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -646,7 +646,7 @@ static unsigned ttm_page_pool_get_pages(struct ttm_page_pool *pool, list_splice_init(&pool->list, pages); count -= pool->npages; pool->npages = 0; - goto out; + goto unlock; } /* find the last pages to include for requested number of pages. Split * pool to begin and halve it to reduce search space. */ @@ -667,7 +667,7 @@ static unsigned ttm_page_pool_get_pages(struct ttm_page_pool *pool, list_cut_position(pages, &pool->list, p); pool->npages -= count; count = 0; -out: + unlock: spin_unlock_irqrestore(&pool->lock, irq_flags); return count; }