On Tue, Dec 08, 2015 at 07:59:39PM +0200, [email protected] wrote: > From: Ville Syrjälä <[email protected]> > > skl_get_buf_trans_*() don't need the 'ddi_translations' local variable > since all they with is assign and return. Just return the right thing > directly and get rid of the local variable. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]> > --- > drivers/gpu/drm/i915/intel_ddi.c | 44 > +++++++++++++++------------------------- > 1 file changed, 16 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c > b/drivers/gpu/drm/i915/intel_ddi.c > index fdb4aaa084d6..f8517ed4d636 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -348,75 +348,63 @@ intel_dig_port_supports_hdmi(const struct > intel_digital_port *intel_dig_port) > return i915_mmio_reg_valid(intel_dig_port->hdmi.hdmi_reg); > } > > -static const struct ddi_buf_trans *skl_get_buf_trans_dp(struct drm_device > *dev, > - int *n_entries) > +static const struct ddi_buf_trans * > +skl_get_buf_trans_dp(struct drm_device *dev, int *n_entries) > { > - const struct ddi_buf_trans *ddi_translations; > - > if (IS_SKL_ULX(dev)) { > - ddi_translations = skl_y_ddi_translations_dp; > *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp); > + return skl_y_ddi_translations_dp; > } else if (IS_SKL_ULT(dev)) { > - ddi_translations = skl_u_ddi_translations_dp; > *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp); > + return skl_u_ddi_translations_dp; > } else { > - ddi_translations = skl_ddi_translations_dp; > *n_entries = ARRAY_SIZE(skl_ddi_translations_dp); > + return skl_ddi_translations_dp; > } > - > - return ddi_translations; > } > > -static const struct ddi_buf_trans *skl_get_buf_trans_edp(struct drm_device > *dev, > - int *n_entries) > +static const struct ddi_buf_trans * > +skl_get_buf_trans_edp(struct drm_device *dev, int *n_entries) > { > struct drm_i915_private *dev_priv = dev->dev_private; > - const struct ddi_buf_trans *ddi_translations; > > if (IS_SKL_ULX(dev)) { > if (dev_priv->edp_low_vswing) { > - ddi_translations = skl_y_ddi_translations_edp; > *n_entries = ARRAY_SIZE(skl_y_ddi_translations_edp); > + return skl_y_ddi_translations_edp; > } else { > - ddi_translations = skl_y_ddi_translations_dp; > *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp); > + return skl_y_ddi_translations_dp; > } > } else if (IS_SKL_ULT(dev)) { > if (dev_priv->edp_low_vswing) { > - ddi_translations = skl_u_ddi_translations_edp; > *n_entries = ARRAY_SIZE(skl_u_ddi_translations_edp); > + return skl_u_ddi_translations_edp; > } else { > - ddi_translations = skl_u_ddi_translations_dp; > *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp); > + return skl_u_ddi_translations_dp; > } > } else { > if (dev_priv->edp_low_vswing) { > - ddi_translations = skl_ddi_translations_edp; > *n_entries = ARRAY_SIZE(skl_ddi_translations_edp); > + return skl_ddi_translations_edp; > } else { > - ddi_translations = skl_ddi_translations_dp; > *n_entries = ARRAY_SIZE(skl_ddi_translations_dp); > + return skl_ddi_translations_dp; > } > } > - > - return ddi_translations; > } > > static const struct ddi_buf_trans * > -skl_get_buf_trans_hdmi(struct drm_device *dev, > - int *n_entries) > +skl_get_buf_trans_hdmi(struct drm_device *dev, int *n_entries) > { > - const struct ddi_buf_trans *ddi_translations; > - > if (IS_SKL_ULX(dev)) { > - ddi_translations = skl_y_ddi_translations_hdmi; > *n_entries = ARRAY_SIZE(skl_y_ddi_translations_hdmi); > + return skl_y_ddi_translations_hdmi; > } else { > - ddi_translations = skl_ddi_translations_hdmi; > *n_entries = ARRAY_SIZE(skl_ddi_translations_hdmi); > + return skl_ddi_translations_hdmi; > } > - > - return ddi_translations; > } > > /* > -- > 2.4.10 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
