Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753880AbbHGN7c (ORCPT ); Fri, 7 Aug 2015 09:59:32 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:50062 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753323AbbHGN7a (ORCPT ); Fri, 7 Aug 2015 09:59:30 -0400 From: Sascha Hauer To: Thierry Reding Cc: Philipp Zabel , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Sascha Hauer Subject: [PATCH 2/2] drm: bridge/dw_hdmi: remove unused code Date: Fri, 7 Aug 2015 15:59:21 +0200 Message-Id: <1438955961-27232-3-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438955961-27232-1-git-send-email-s.hauer@pengutronix.de> References: <1438955961-27232-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1826 Lines: 62 The cable_plugin field in struct dw_hdmi is never set. Remove it and with it all code that is only executed when the variable is true. Signed-off-by: Sascha Hauer --- drivers/gpu/drm/bridge/dw_hdmi.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index 8d9b53c..401067e 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -118,7 +118,6 @@ struct dw_hdmi { int vic; struct edid *edid; - bool cable_plugin; bool phy_enabled; struct drm_display_mode previous_mode; @@ -1164,24 +1163,10 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, val, HDMI_FC_INVIDCONF); } -static void hdmi_enable_overflow_interrupts(struct dw_hdmi *hdmi) -{ - hdmi_writeb(hdmi, 0, HDMI_FC_MASK2); - hdmi_writeb(hdmi, 0, HDMI_IH_MUTE_FC_STAT2); -} - -static void hdmi_disable_overflow_interrupts(struct dw_hdmi *hdmi) -{ - hdmi_writeb(hdmi, HDMI_IH_MUTE_FC_STAT2_OVERFLOW_MASK, - HDMI_IH_MUTE_FC_STAT2); -} - static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) { int ret; - hdmi_disable_overflow_interrupts(hdmi); - hdmi->vic = drm_match_cea_mode(mode); if (!hdmi->vic) { @@ -1255,8 +1240,6 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) hdmi_tx_hdcp_config(hdmi); dw_hdmi_clear_overflow(hdmi); - if (hdmi->cable_plugin && !hdmi->hdmi_data.video_mode.mdvi) - hdmi_enable_overflow_interrupts(hdmi); return 0; } -- 2.4.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/