From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/4] drm/i915: remove redundant is_edp() check Date: Tue, 22 Apr 2014 19:55:44 -0300 Message-ID: <1398207345-1865-3-git-send-email-przanoni@gmail.com> References: <20140411132123.GH9262@phenom.ffwll.local> <1398207345-1865-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-yk0-f174.google.com (mail-yk0-f174.google.com [209.85.160.174]) by gabe.freedesktop.org (Postfix) with ESMTP id E48EA6E972 for ; Tue, 22 Apr 2014 15:56:07 -0700 (PDT) Received: by mail-yk0-f174.google.com with SMTP id 20so140030yks.33 for ; Tue, 22 Apr 2014 15:56:07 -0700 (PDT) In-Reply-To: <1398207345-1865-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni If intel_edp_init_connector() returns false, then we know that is_edp() is true because of the early return at intel_edp_init_connector(). So remove the redundant check. Change proposed by Chris on his review to "drm/i915: get power domain in case the BIOS enabled eDP VDD". Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_dp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index b385b03..a25f708 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3958,12 +3958,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, if (!intel_edp_init_connector(intel_dp, intel_connector, &power_seq)) { drm_dp_aux_unregister_i2c_bus(&intel_dp->aux); - if (is_edp(intel_dp)) { - cancel_delayed_work_sync(&intel_dp->panel_vdd_work); - mutex_lock(&dev->mode_config.mutex); - edp_panel_vdd_off_sync(intel_dp); - mutex_unlock(&dev->mode_config.mutex); - } + cancel_delayed_work_sync(&intel_dp->panel_vdd_work); + mutex_lock(&dev->mode_config.mutex); + edp_panel_vdd_off_sync(intel_dp); + mutex_unlock(&dev->mode_config.mutex); drm_sysfs_connector_remove(connector); drm_connector_cleanup(connector); return false; -- 1.9.0