[PATCH 07/12] drm/i915: rename vlv_get_hpll_vco() to vlv_clock_get_hpll_vco()

[Jani Nikula]

Follow the new vlv_clock_*() naming pattern for all the related VLV
clock functions.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c   | 2 +-
 drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
 drivers/gpu/drm/i915/display/intel_display.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c 
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 94c6bea10b10..e8c9ad7d8e82 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -609,7 +609,7 @@ static void vlv_get_cdclk(struct intel_display *display,
 
        vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_CCK) | 
BIT(VLV_IOSF_SB_PUNIT));
 
-       cdclk_config->vco = vlv_get_hpll_vco(display->drm);
+       cdclk_config->vco = vlv_clock_get_hpll_vco(display->drm);
        cdclk_config->cdclk = vlv_clock_get_cdclk(display->drm);
 
        val = vlv_punit_read(display->drm, PUNIT_REG_DSPSSPM);
diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 4e368d409f01..6fb7d14dba9e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -141,7 +141,7 @@ static void bdw_set_pipe_misc(struct intel_dsb *dsb,
                              const struct intel_crtc_state *crtc_state);
 
 /* returns HPLL frequency in kHz */
-int vlv_get_hpll_vco(struct drm_device *drm)
+int vlv_clock_get_hpll_vco(struct drm_device *drm)
 {
        int hpll_freq, vco_freq[] = { 800, 1600, 2000, 2400 };
 
@@ -177,7 +177,7 @@ static int vlv_get_cck_clock_hpll(struct drm_device *drm,
        vlv_cck_get(drm);
 
        if (dev_priv->hpll_freq == 0)
-               dev_priv->hpll_freq = vlv_get_hpll_vco(drm);
+               dev_priv->hpll_freq = vlv_clock_get_hpll_vco(drm);
 
        hpll = vlv_get_cck_clock(drm, name, reg, dev_priv->hpll_freq);
 
@@ -206,7 +206,7 @@ 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,
-                                vlv_get_hpll_vco(drm));
+                                vlv_clock_get_hpll_vco(drm));
 }
 
 int vlv_clock_get_gpll(struct drm_device *drm)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h 
b/drivers/gpu/drm/i915/display/intel_display.h
index 57b06cad314b..5c406b276a76 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -435,7 +435,7 @@ void intel_enable_transcoder(const struct intel_crtc_state 
*new_crtc_state);
 void intel_disable_transcoder(const struct intel_crtc_state *old_crtc_state);
 void i830_enable_pipe(struct intel_display *display, enum pipe pipe);
 void i830_disable_pipe(struct intel_display *display, enum pipe pipe);
-int vlv_get_hpll_vco(struct drm_device *drm);
+int vlv_clock_get_hpll_vco(struct drm_device *drm);
 int vlv_clock_get_hrawclk(struct drm_device *drm);
 int vlv_clock_get_czclk(struct drm_device *drm);
 int vlv_clock_get_cdclk(struct drm_device *drm);
-- 
2.39.5