[Intel-gfx] [PATCH v2 2/2] drm/i915/bios: reduce the scope of some local variables in parse_ddi_port()

[Chris Wilson]

Quoting Jani Nikula (2018-04-11 14:15:19)
> No functional changes.
> 
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_bios.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 447b721c3be9..036307af8419 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1215,10 +1215,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>  {
>         struct child_device_config *it, *child = NULL;
>         struct ddi_vbt_port_info *info = &dev_priv->vbt.ddi_port_info[port];
> -       uint8_t hdmi_level_shift;
>         int i, j;
>         bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;
> -       uint8_t aux_channel, ddc_pin;
>         /* Each DDI port can have more than one value on the "DVO Port" field,
>          * so look for all the possible values for each port.
>          */
> @@ -1255,8 +1253,6 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>         if (!child)
>                 return;
>  
> -       aux_channel = child->aux_channel;
> -
>         is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
>         is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
>         is_crt = child->device_type & DEVICE_TYPE_ANALOG_OUTPUT;
> @@ -1302,6 +1298,8 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>                 DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port));
>  
>         if (is_dvi) {
> +               u8 ddc_pin;
> +
>                 ddc_pin = map_ddc_pin(dev_priv, child->ddc_pin);
>                 if (intel_gmbus_is_valid_pin(dev_priv, ddc_pin)) {
>                         info->alternate_ddc_pin = ddc_pin;
> @@ -1314,14 +1312,14 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
>         }
>  
>         if (is_dp) {
> -               info->alternate_aux_channel = aux_channel;
> +               info->alternate_aux_channel = child->aux_channel;
>  
>                 sanitize_aux_ch(dev_priv, port);
>         }
>  
>         if (bdb_version >= 158) {
>                 /* The VBT HDMI level shift values match the table we have. */
> -               hdmi_level_shift = child->hdmi_level_shifter_value;
> +               u8 hdmi_level_shift = child->hdmi_level_shifter_value;

checkpatch will ask for a \n,

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris