From: Michał Grzelak Date: Fri, 19 Sep 2025 21:54:13 +0000 (+0200) Subject: drm/i915: rename vlv_get_cck_clock() to vlv_clock_get_cck() X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90930b637dce2e600728829250645734929d7388;p=thirdparty%2Fkernel%2Flinux.git drm/i915: rename vlv_get_cck_clock() to vlv_clock_get_cck() Keep the convention of naming vlv_clock* instead of vlv_*_clock. Signed-off-by: Michał Grzelak Link: https://lore.kernel.org/r/20250919215413.1006296-1-michal.grzelak@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/vlv_clock.c b/drivers/gpu/drm/i915/display/vlv_clock.c index 42c2837b32c1f..1abdae453514e 100644 --- a/drivers/gpu/drm/i915/display/vlv_clock.c +++ b/drivers/gpu/drm/i915/display/vlv_clock.c @@ -36,7 +36,7 @@ int vlv_clock_get_hpll_vco(struct drm_device *drm) return display->vlv_clock.hpll_freq; } -static int vlv_get_cck_clock(struct drm_device *drm, +static int vlv_clock_get_cck(struct drm_device *drm, const char *name, u32 reg, int ref_freq) { u32 val; @@ -58,7 +58,7 @@ static int vlv_get_cck_clock(struct drm_device *drm, int vlv_clock_get_hrawclk(struct drm_device *drm) { /* RAWCLK_FREQ_VLV register updated from power well code */ - return vlv_get_cck_clock(drm, "hrawclk", CCK_DISPLAY_REF_CLOCK_CONTROL, + return vlv_clock_get_cck(drm, "hrawclk", CCK_DISPLAY_REF_CLOCK_CONTROL, vlv_clock_get_hpll_vco(drm)); } @@ -67,7 +67,7 @@ int vlv_clock_get_czclk(struct drm_device *drm) struct intel_display *display = to_intel_display(drm); if (!display->vlv_clock.czclk_freq) { - display->vlv_clock.czclk_freq = vlv_get_cck_clock(drm, "czclk", CCK_CZ_CLOCK_CONTROL, + display->vlv_clock.czclk_freq = vlv_clock_get_cck(drm, "czclk", CCK_CZ_CLOCK_CONTROL, vlv_clock_get_hpll_vco(drm)); drm_dbg_kms(drm, "CZ clock rate: %d kHz\n", display->vlv_clock.czclk_freq); } @@ -77,12 +77,12 @@ int vlv_clock_get_czclk(struct drm_device *drm) int vlv_clock_get_cdclk(struct drm_device *drm) { - return vlv_get_cck_clock(drm, "cdclk", CCK_DISPLAY_CLOCK_CONTROL, + return vlv_clock_get_cck(drm, "cdclk", CCK_DISPLAY_CLOCK_CONTROL, vlv_clock_get_hpll_vco(drm)); } int vlv_clock_get_gpll(struct drm_device *drm) { - return vlv_get_cck_clock(drm, "GPLL ref", CCK_GPLL_CLOCK_CONTROL, + return vlv_clock_get_cck(drm, "GPLL ref", CCK_GPLL_CLOCK_CONTROL, vlv_clock_get_czclk(drm)); }