From: Jani Nikula Date: Fri, 12 Sep 2025 14:48:50 +0000 (+0300) Subject: drm/i915: remove vlv_get_cck_clock_hpll() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73383c3062e895125abe76fa3cbb8febc2deb73b;p=thirdparty%2Fkernel%2Flinux.git 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 # v1 Acked-by: Ville Syrjälä Link: https://lore.kernel.org/r/1e5ef7a14cdf42048a03719cff380fee6c3016e0.1757688216.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 7b5379262a374..8f200593053e4 100644 --- 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; }