drm/i915: remove vlv_get_cck_clock_hpll()

The function has become so trivial it's no longer necessary. Inline it
at the call sites.

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com> # v1
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/1e5ef7a14cdf42048a03719cff380fee6c3016e0.1757688216.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 7b5379262a374f0169a2ff9b14f558d9f361ff01..8f200593053e4cf829e8bc0a6f88fe9331f17774 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -179,16 +179,11 @@ static int vlv_get_cck_clock(struct drm_device *drm,
        return DIV_ROUND_CLOSEST(ref_freq << 1, divider + 1);
 }
 
-static int vlv_get_cck_clock_hpll(struct drm_device *drm,
-                                 const char *name, u32 reg)
-{
-       return vlv_get_cck_clock(drm, name, reg, vlv_clock_get_hpll_vco(drm));
-}
-
 int vlv_clock_get_hrawclk(struct drm_device *drm)
 {
        /* RAWCLK_FREQ_VLV register updated from power well code */
-       return vlv_get_cck_clock_hpll(drm, "hrawclk", CCK_DISPLAY_REF_CLOCK_CONTROL);
+       return vlv_get_cck_clock(drm, "hrawclk", CCK_DISPLAY_REF_CLOCK_CONTROL,
+                                vlv_clock_get_hpll_vco(drm));
 }
 
 int vlv_clock_get_czclk(struct drm_device *drm)
@@ -196,8 +191,8 @@ int vlv_clock_get_czclk(struct drm_device *drm)
        struct drm_i915_private *i915 = to_i915(drm);
 
        if (!i915->czclk_freq)
-               i915->czclk_freq = vlv_get_cck_clock_hpll(drm, "czclk",
-                                                         CCK_CZ_CLOCK_CONTROL);
+               i915->czclk_freq = vlv_get_cck_clock(drm, "czclk", CCK_CZ_CLOCK_CONTROL,
+                                                    vlv_clock_get_hpll_vco(drm));
 
        return i915->czclk_freq;
 }