From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932194AbdJXOAi (ORCPT ); Tue, 24 Oct 2017 10:00:38 -0400 Received: from mout.web.de ([212.227.17.11]:58031 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751477AbdJXOAY (ORCPT ); Tue, 24 Oct 2017 10:00:24 -0400 Subject: [PATCH 2/2] drm/i915/dp: Use common error handling code in intel_dp_sink_crc_stop() From: SF Markus Elfring To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, David Airlie , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: LKML , kernel-janitors@vger.kernel.org References: <668a4b56-091d-d4e7-2204-daaec6675e11@users.sourceforge.net> Message-ID: <1d3d0395-957a-2a87-3cb5-0d7355d04b65@users.sourceforge.net> Date: Tue, 24 Oct 2017 16:00:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <668a4b56-091d-d4e7-2204-daaec6675e11@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:ibvTG5rG0VU79E4UVPgrWg0ufLGiNhqQUa8UplrkbaaSVbBn4wY b+GRdiM/te3x10s+7oIcLCE1tKg2wWw2W9rtC29Noqh/PMlT3o6t8R3FXPYCpZgnfY0YMUQ NIr9bcPKZ43QEe9qk2Vy386v6x6RQPmNsjrzgrBEgJ2SsN2kwpqLL+C8ZJeVu6QNUcJcPTH 14YY0OK3UhPEYejjaJ3xw== X-UI-Out-Filterresults: notjunk:1;V01:K0:3XtFwRm+Zl4=:Qg81Nqi1ZpNLaGnLvM7wI4 HXysKh0gaGzZgUrV9xxqqkiSoqVOi37GGgL+l4Xc2ycZ77YM9Y/qIGSjD13gEC1qAWJAZmxOu le/Qu8EPC/Okqa4bg5NcC0GvSZpT000kWxzFyqtp95Z38vL/wqqF9ezj99uMmHRtrlyUp3veF EWqHFjbsZqHfQuGLuAaApJIQg8d8cOeeleP7VTRErzq0kmcVduUQfpPsyimjiK6gGuEbWsMXg LEn1gWWmz6O4Ceq6NUZE9C54cCz0wq9VOyPNDWL1rd1LMPRLL3wGec1pYMB7b6/vcxb60ljYF A4qdKAV3Acr+9UgWHXUr1UCw4uyf4csazqSa1OI5hGQXzgTA0Pna6ruvQI9zc38iQ/0Hfxo5J mLjdXwJNYkaerYp0pP9QrwUrKFgQwT2ryPQTqBjzNNEZOY4VkdbtFYTuNN5rg5waulZCU5J1a GUu3G2BcHSP2DD4RkpvI3GwtkJfkJkuM1Re4lhD/726gwpcpTeOcUfht/e/zoAkDZoSJTwB5d 9MOa0aKtGVdcozFUaeLBDtt+7IuttsTSemzkJmXL3q/sK5q9d5vcumYSJ0AR8eEeiZngUykt1 By6FPSS/JT9pLc8sOWU/EErdeKn3Yo68nPW+4nfOaDhcTrROKrStaE0j2BndYkVpYqkL9Tqy2 9324pGuydjzsgQKaU7RSJZ5sH/KxOZe8tviOjiHj5UtEuVb9K7dDKORLxPmLb7jL2GYWz5ZQL Ly7gZ9lvpFgJhV3LK4BsGIwaIasVR2yO91P3dMeOVdXMD293jlMQIvzBIVBBaqLuFVLO2GrIV 1jZ43TOEXnH1fvPi7XqOZSEqefuvol8jNJxV+tpkxlsnLQ2e9o= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 24 Oct 2017 15:40:47 +0200 Adjust jump targets so that a specific error code assignment will be in the implementation only at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/i915/intel_dp.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 342f1a1fa085..3dd514a77008 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3894,27 +3894,19 @@ static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp) int count = 0; int attempts = 10; - if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0) { - DRM_DEBUG_KMS("Sink CRC couldn't be stopped properly\n"); - ret = -EIO; - goto out; - } + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK, &buf) < 0) + goto report_failure; if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_TEST_SINK, - buf & ~DP_TEST_SINK_START) < 0) { - DRM_DEBUG_KMS("Sink CRC couldn't be stopped properly\n"); - ret = -EIO; - goto out; - } + buf & ~DP_TEST_SINK_START) < 0) + goto report_failure; do { intel_wait_for_vblank(dev_priv, intel_crtc->pipe); + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_SINK_MISC, &buf) + < 0) + goto e_io; - if (drm_dp_dpcd_readb(&intel_dp->aux, - DP_TEST_SINK_MISC, &buf) < 0) { - ret = -EIO; - goto out; - } count = buf & DP_TEST_COUNT_MASK; } while (--attempts && count); @@ -3923,9 +3915,15 @@ static int intel_dp_sink_crc_stop(struct intel_dp *intel_dp) ret = -ETIMEDOUT; } - out: +enable_ips: hsw_enable_ips(intel_crtc); return ret; + +report_failure: + DRM_DEBUG_KMS("Sink CRC couldn't be stopped properly\n"); +e_io: + ret = -EIO; + goto enable_ips; } static int intel_dp_sink_crc_start(struct intel_dp *intel_dp) -- 2.14.3