[Intel-gfx] [PATCH 2/2] drm/i915/ddi: use switch case instead of if ladder for ddi_get_encoder_port

[Daniel Vetter]

On Tue, Sep 29, 2015 at 10:24:26AM +0300, Jani Nikula wrote:
> Make the alternatives stand  out better.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Both applied to dinq.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++-------
>  1 file changed, 13 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index fdcb4562c8ce..2b5a29817e2e 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -309,20 +309,26 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
>  				 enum port *port)
>  {
>  	struct drm_encoder *encoder = &intel_encoder->base;
> -	int type = intel_encoder->type;
>  
> -	if (type == INTEL_OUTPUT_DP_MST) {
> +	switch (intel_encoder->type) {
> +	case INTEL_OUTPUT_DP_MST:
>  		*dig_port = enc_to_mst(encoder)->primary;
>  		*port = (*dig_port)->port;
> -	} else if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP ||
> -	    type == INTEL_OUTPUT_HDMI || type == INTEL_OUTPUT_UNKNOWN) {
> +		break;
> +	case INTEL_OUTPUT_DISPLAYPORT:
> +	case INTEL_OUTPUT_EDP:
> +	case INTEL_OUTPUT_HDMI:
> +	case INTEL_OUTPUT_UNKNOWN:
>  		*dig_port = enc_to_dig_port(encoder);
>  		*port = (*dig_port)->port;
> -	} else if (type == INTEL_OUTPUT_ANALOG) {
> +		break;
> +	case INTEL_OUTPUT_ANALOG:
>  		*dig_port = NULL;
>  		*port = PORT_E;
> -	} else {
> -		WARN(1, "Invalid DDI encoder type %d\n", type);
> +		break;
> +	default:
> +		WARN(1, "Invalid DDI encoder type %d\n", intel_encoder->type);
> +		break;
>  	}
>  }
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch