On Thu, 29 Sep 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Get rid of the funny hsw vs. ivb extra indentation level in > intel_color_init_hooks(). > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_color.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c > index ddfe7c257a72..ce8a4be9b292 100644 > --- a/drivers/gpu/drm/i915/display/intel_color.c > +++ b/drivers/gpu/drm/i915/display/intel_color.c > @@ -2238,12 +2238,11 @@ void intel_color_init_hooks(struct drm_i915_private *dev_priv) > dev_priv->display.funcs.color = &skl_color_funcs; > else if (DISPLAY_VER(dev_priv) == 8) > dev_priv->display.funcs.color = &bdw_color_funcs; > - else if (DISPLAY_VER(dev_priv) == 7) { > - if (IS_HASWELL(dev_priv)) > - dev_priv->display.funcs.color = &hsw_color_funcs; > - else > - dev_priv->display.funcs.color = &ivb_color_funcs; > - } else > + else if (IS_HASWELL(dev_priv)) > + dev_priv->display.funcs.color = &hsw_color_funcs; > + else if (DISPLAY_VER(dev_priv) == 7) > + dev_priv->display.funcs.color = &ivb_color_funcs; > + else > dev_priv->display.funcs.color = &ilk_color_funcs; > } > } -- Jani Nikula, Intel Open Source Graphics Center