On Wed, Sep 16, 2015 at 01:41:38PM -0700, Douglas Anderson wrote:
There's a member in 'struct dw_hdmi' called cable_plugin. It's never set to anything anywhere so thus is always false. There's a bit of code checking it, but since it's always false this must be dead code. Eliminate it.
Note: if someone wants to figure out the intention of the original code and implement whatever feature / fix was needed then we can drop this patch. The 'cable_plugin' member has been unused since the code was first added in (9aaf880 imx-drm: Add mx6 hdmi transmitter support).
Signed-off-by: Douglas Anderson dianders@chromium.org
drivers/gpu/drm/bridge/dw_hdmi.c | 9 --------- 1 file changed, 9 deletions(-)
Except for the CHROMIUM: prefix this looks good to me:
Reviewed-by: Thierry Reding treding@nvidia.com
Russell, do you have patches to this driver queued for v4.4 and plan to pick this up into your tree or should I take it?
Thierry
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index 0083d4e..ba90885 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -115,7 +115,6 @@ struct dw_hdmi { int vic;
u8 edid[HDMI_EDID_LEN];
bool cable_plugin;
bool phy_enabled; struct drm_display_mode previous_mode;
@@ -1203,12 +1202,6 @@ 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, @@ -1285,8 +1278,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->sink_is_hdmi)
hdmi_enable_overflow_interrupts(hdmi);return 0;
}
2.6.0.rc0.131.gf624c3d