[PATCH v4 6/9] drm/i915/display: rename __intel_wait_for_register_nowl() to indicate intel_de_

[Jani Nikula]

Rename __intel_wait_for_register_nowl() to
__intel_de_wait_for_register_nowl() to be in line with the rest of
intel_de.h.

Cc: Luca Coelho <luciano.coe...@intel.com>
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_de.h     |  6 +++---
 drivers/gpu/drm/i915/display/intel_dmc_wl.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_de.h 
b/drivers/gpu/drm/i915/display/intel_de.h
index 0a0fba81e7af..4b51388c6041 100644
--- a/drivers/gpu/drm/i915/display/intel_de.h
+++ b/drivers/gpu/drm/i915/display/intel_de.h
@@ -97,8 +97,8 @@ intel_de_rmw(struct drm_i915_private *i915, i915_reg_t reg, 
u32 clear, u32 set)
 }
 
 static inline int
-__intel_wait_for_register_nowl(struct drm_i915_private *i915, i915_reg_t reg,
-                              u32 mask, u32 value, unsigned int timeout)
+__intel_de_wait_for_register_nowl(struct drm_i915_private *i915, i915_reg_t 
reg,
+                                 u32 mask, u32 value, unsigned int timeout)
 {
        return intel_wait_for_register(&i915->uncore, reg, mask,
                                       value, timeout);
@@ -112,7 +112,7 @@ intel_de_wait(struct drm_i915_private *i915, i915_reg_t reg,
 
        intel_dmc_wl_get(i915, reg);
 
-       ret = __intel_wait_for_register_nowl(i915, reg, mask, value, timeout);
+       ret = __intel_de_wait_for_register_nowl(i915, reg, mask, value, 
timeout);
 
        intel_dmc_wl_put(i915, reg);
 
diff --git a/drivers/gpu/drm/i915/display/intel_dmc_wl.c 
b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
index 30f8905fae41..162de0d20554 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc_wl.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
@@ -77,9 +77,9 @@ static void intel_dmc_wl_work(struct work_struct *work)
 
        __intel_de_rmw_nowl(i915, DMC_WAKELOCK1_CTL, DMC_WAKELOCK_CTL_REQ, 0);
 
-       if (__intel_wait_for_register_nowl(i915,  DMC_WAKELOCK1_CTL,
-                                          DMC_WAKELOCK_CTL_ACK, 0,
-                                          DMC_WAKELOCK_CTL_TIMEOUT)) {
+       if (__intel_de_wait_for_register_nowl(i915, DMC_WAKELOCK1_CTL,
+                                             DMC_WAKELOCK_CTL_ACK, 0,
+                                             DMC_WAKELOCK_CTL_TIMEOUT)) {
                WARN_RATELIMIT(1, "DMC wakelock release timed out");
                goto out_unlock;
        }
@@ -216,10 +216,10 @@ void intel_dmc_wl_get(struct drm_i915_private *i915, 
i915_reg_t reg)
                __intel_de_rmw_nowl(i915, DMC_WAKELOCK1_CTL, 0,
                                    DMC_WAKELOCK_CTL_REQ);
 
-               if (__intel_wait_for_register_nowl(i915,  DMC_WAKELOCK1_CTL,
-                                                  DMC_WAKELOCK_CTL_ACK,
-                                                  DMC_WAKELOCK_CTL_ACK,
-                                                  DMC_WAKELOCK_CTL_TIMEOUT)) {
+               if (__intel_de_wait_for_register_nowl(i915, DMC_WAKELOCK1_CTL,
+                                                     DMC_WAKELOCK_CTL_ACK,
+                                                     DMC_WAKELOCK_CTL_ACK,
+                                                     
DMC_WAKELOCK_CTL_TIMEOUT)) {
                        WARN_RATELIMIT(1, "DMC wakelock ack timed out");
                        goto out_unlock;
                }
-- 
2.39.2