From patchwork Sun Sep 18 16:53:06 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: 9337977 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 66D556022E for ; Sun, 18 Sep 2016 16:53:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5594A28993 for ; Sun, 18 Sep 2016 16:53:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 493A228C63; Sun, 18 Sep 2016 16:53:19 +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 BC71928993 for ; Sun, 18 Sep 2016 16:53:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63B446E115; Sun, 18 Sep 2016 16:53:16 +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.17.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 393E46E115 for ; Sun, 18 Sep 2016 16:53:14 +0000 (UTC) Received: from [192.168.1.2] ([77.181.85.138]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MejmG-1bNQLr1Rf6-00OCNn; Sun, 18 Sep 2016 18:53:07 +0200 Subject: [PATCH 4/5] drm/amdgpu: Rename a jump label in amdgpu_device_init() To: dri-devel@lists.freedesktop.org, Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , Chunming Zhou , David Airlie , Monk Liu , Tom St Denis References: <566ABCD9.1060404@users.sourceforge.net> <8d614254-1cba-0379-cf84-52ad9bd9f3a7@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Sun, 18 Sep 2016 18:53:06 +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: <8d614254-1cba-0379-cf84-52ad9bd9f3a7@users.sourceforge.net> X-Provags-ID: V03:K0:NMSlspl99k3W1eUWn9ZfS6xzsoPCKUD2qAMjEYkQ2pQMowiAjEU eB26hfoGEstiLWx2IOXPQptBKkcjn0A6XLin69Q6goP6usTlwurc3cY6gEcqSEtyqRLpRqc 12EgxAahFjkyxZihaclVzIFP3UxPxOF15OtOfztUp+T5PI5yj3nPaH41S7kw5DYWP4a3EAz a4BJIfLYDJPeo0jNB9I/Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:6GIjMNhYGOs=:iskgwyJynwC7Z7TplHKG7S S4Km6WlWgsAKbyHH/sTwJ2q/2SIl/z1Cd3Z/L3pDLLHHPS/PIjK1JIL0HtQyDH+aRpPRVjhRF 02Z3h3dKFjh7Dd0O9T4hGc3nhfr1q2awt2eeQx5lvaOo1C5e0kNzGl5ZBEqLp3MLHF0mmAKpm DvPM6wUjimroHDnJGnOdl0iqewXRtzWaLIgxWnJi52yTl+lc1pM75tbbKGfCxIGm+AaBy9mxN 5lvXqMTrmkjIMa5ZVXXLcW1YWQ33Tkwzf6WaMoaosRMzRScbmVIegfrnPXxACL8yGoWVQ0S8O 5Ej8i9d5SX9CtfWO2kJeHKjQudOW9qz6skV/9d+wvAWeFVgpZ8sW5APHAdgnAAEywt6ZIG6dD 3LSOOfmzWssFxPwneJJk/wpGgitkHb/ttWKUK0GxiOqrG7jjzafQB/qyg41jXc6DF7P52ReIn Pfp3QxWPanIKtSU1wXpfTFq0N1JF3TJX8h+6OjhHSCd4wRuaMBsdjQwnFjDb/JxNN8ny5JdYj QpJX47+V64NjJoYGAC+D1//VgKFR9rMcveeFBv4rmdmHJclQMOGWk0UJvALiyCfCQjO4Q9Ovu 8bhC6iw5SWr1LGy05XWVj9GeL8ZyBco2tX8syI92ClVK0ocpFkBxJNT0BQaMmhVszK6rnGhXn Scq9m8b2PbW5DsrwVkGEq9xjltWGCYoNt/D27YV1FdrGtS/loUxo0Kxj4Wbh9hhkp7treKWC2 YTrCRzk/IP/mAEvxQOlxRnOK1Onlm5gaChpKUAEyTjpePe+XgkRWrVI6e6unGEftjqfMmX9ea YgXk1uQ 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: Sun, 18 Sep 2016 17:50:09 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 2b8ba97..fed4854 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1566,18 +1566,18 @@ int amdgpu_device_init(struct amdgpu_device *adev, /* Read BIOS */ if (!amdgpu_get_bios(adev)) { r = -EINVAL; - goto failed; + goto check_runtime; } /* Must be an ATOMBIOS */ if (!adev->is_atom_bios) { dev_err(adev->dev, "Expecting atombios for GPU\n"); r = -EINVAL; - goto failed; + goto check_runtime; } r = amdgpu_atombios_init(adev); if (r) { dev_err(adev->dev, "amdgpu_atombios_init failed\n"); - goto failed; + goto check_runtime; } /* See if the asic supports SR-IOV */ @@ -1595,7 +1595,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, if (!adev->bios) { dev_err(adev->dev, "Card not posted and no BIOS - ignoring\n"); r = -EINVAL; - goto failed; + goto check_runtime; } DRM_INFO("GPU not posted. posting now...\n"); amdgpu_atom_asic_init(adev->mode_info.atom_context); @@ -1605,7 +1605,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, r = amdgpu_atombios_get_clock_info(adev); if (r) { dev_err(adev->dev, "amdgpu_atombios_get_clock_info failed\n"); - goto failed; + goto check_runtime; } /* init i2c buses */ amdgpu_atombios_i2c_init(adev); @@ -1614,7 +1614,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, r = amdgpu_fence_driver_init(adev); if (r) { dev_err(adev->dev, "amdgpu_fence_driver_init failed\n"); - goto failed; + goto check_runtime; } /* init the mode config */ @@ -1624,7 +1624,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, if (r) { dev_err(adev->dev, "amdgpu_init failed\n"); amdgpu_fini(adev); - goto failed; + goto check_runtime; } adev->accel_working = true; @@ -1634,7 +1634,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, r = amdgpu_ib_pool_init(adev); if (r) { dev_err(adev->dev, "IB initialization failed (%d).\n", r); - goto failed; + goto check_runtime; } r = amdgpu_ib_ring_tests(adev); @@ -1682,12 +1682,11 @@ int amdgpu_device_init(struct amdgpu_device *adev, r = amdgpu_late_init(adev); if (r) { dev_err(adev->dev, "amdgpu_late_init failed\n"); - goto failed; + goto check_runtime; } return 0; - -failed: + check_runtime: if (runtime) vga_switcheroo_fini_domain_pm_ops(adev->dev); return r;