[Intel-gfx] [PATCH] drm/i915: Fix braces in conditonal branches

[Chris Wilson]

On Tue, Aug 09, 2016 at 03:06:10PM -0700, Dhinakaran Pandiyan wrote:
> No functional change, just adding braces to all branches of conditional
> statement because one of them already had.
> ---
>  drivers/gpu/drm/i915/intel_audio.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index d32f586..26a795f 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -335,11 +335,11 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
>  
>  	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
>  	if (audio_rate_need_prog(intel_crtc, adjusted_mode)) {
> -		if (!acomp)
> +		if (!acomp) {
>  			rate = 0;
> -		else if (port >= PORT_A && port <= PORT_E)
> +		} else if (port >= PORT_A && port <= PORT_E) {
>  			rate = acomp->aud_sample_rate[port];
> -		else {
> +		} else {
>  			DRM_ERROR("invalid port: %d\n", port);
>  			rate = 0;
>  		}

Or you could improve scoping of the locals and eliminate a few lines
whilst adding more information to the debug:

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index d32f586..98d4576 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -282,14 +282,9 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
        struct drm_i915_private *dev_priv = to_i915(connector->dev);
        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
        enum pipe pipe = intel_crtc->pipe;
-       struct i915_audio_component *acomp = dev_priv->audio_component;
        const uint8_t *eld = connector->eld;
-       struct intel_digital_port *intel_dig_port =
-               enc_to_dig_port(&encoder->base);
-       enum port port = intel_dig_port->port;
        uint32_t tmp;
        int len, i;
-       int n, rate;
 
        DRM_DEBUG_KMS("Enable audio codec on pipe %c, %u bytes ELD\n",
                      pipe_name(pipe), drm_eld_size(eld));
@@ -335,19 +330,18 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
 
        tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
        if (audio_rate_need_prog(intel_crtc, adjusted_mode)) {
-               if (!acomp)
-                       rate = 0;
-               else if (port >= PORT_A && port <= PORT_E)
+               enum port port = enc_to_dig_port(&encoder_base)->port;
+               struct i915_audio_component *acomp = dev_priv->audio_component;
+               int rate, n;
+
+               rate = 0;
+               if (acomp && port >= PORT_A && port <= PORT_E)
                        rate = acomp->aud_sample_rate[port];
-               else {
-                       DRM_ERROR("invalid port: %d\n", port);
-                       rate = 0;
-               }
+
                n = audio_config_get_n(adjusted_mode, rate);
-               if (n != 0)
+               DRM_DEBUG_KMS("port %d audio rate %d => N=%x\n", port, rate, n);
+               if (n)
                        tmp = audio_config_setup_n_reg(n, tmp);
-               else
-                       DRM_DEBUG_KMS("no suitable N value is found\n");
        }
 
        I915_WRITE(HSW_AUD_CFG(pipe), tmp);


-- 
Chris Wilson, Intel Open Source Technology Centre