drm/i915: unify HDMI/DP hpd definitions

They're physically the same pins and also the same bits, duplicating
only confuses the reader. This also makes it a bit obvious that we
have quite some code duplication going on here. Squashing that is for
a larger rework in our hpd handling though.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 5b4efd64c2f9..5a6138c62fe9 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -802,10 +802,10 @@ static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
 
         switch (intel_dig_port->port) {
         case PORT_B:
-                bit = HDMIB_HOTPLUG_LIVE_STATUS;
+                bit = PORTB_HOTPLUG_LIVE_STATUS;
                 break;
         case PORT_C:
-                bit = HDMIC_HOTPLUG_LIVE_STATUS;
+                bit = PORTC_HOTPLUG_LIVE_STATUS;
                 break;
         default:
                 bit = 0;
@@ -1022,15 +1022,15 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         switch (port) {
         case PORT_B:
                 intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
-                dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
+                dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;
                 break;
         case PORT_C:
                 intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
-                dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
+                dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;
                 break;
         case PORT_D:
                 intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
-                dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS;
+                dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;
                 break;
         case PORT_A:
                 /* Internal port only for eDP. */