On Thu, Oct 05, 2017 at 06:38:41PM -0300, Paulo Zanoni wrote: > Don't call it when we can do like the other functions and just look at > port->port. Also rename the intel_digital_port variable to make it > look like the other functions. > > My main goal here is to prevent the copy-pasters from propagating the > call to other parts of the code. > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dp.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index ca48bce..6fb90fa 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4614,14 +4614,11 @@ static bool bdw_digital_port_connected(struct drm_i915_private *dev_priv, > } > > static bool bxt_digital_port_connected(struct drm_i915_private *dev_priv, > - struct intel_digital_port *intel_dig_port) > + struct intel_digital_port *port) > { > - struct intel_encoder *intel_encoder = &intel_dig_port->base; > - enum port port; > u32 bit; > > - port = intel_hpd_pin_to_port(intel_encoder->hpd_pin); > - switch (port) { > + switch (port->port) { Hmm. I'm thinking we might want to go the other way and change everyone else to use hpd_pin instead. IIRC we'll need to start considering mixed hpd_pin<->port mappings with port F. We already had to do this with the BXT A step w/a (though it was just crudely hacked in) which I suppose is the reason the BXT code is still doing this. Though I see no reason why we would have to call intel_hpd_pin_to_port() here. Instead we could just 's/port->port/encoder->hpd_pin/' everywhere. > case PORT_A: > bit = BXT_DE_PORT_HP_DDIA; > break; > @@ -4632,7 +4629,7 @@ static bool bxt_digital_port_connected(struct drm_i915_private *dev_priv, > bit = BXT_DE_PORT_HP_DDIC; > break; > default: > - MISSING_CASE(port); > + MISSING_CASE(port->port); > return false; > } > > -- > 2.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx