drm/i915: Drop const qualifiers from params in wait_for_register()

These params are passed by value, const qualifiers are ignored any way.
While around, unify timeout_ms type from long to int.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170410093817.151280-1-michal.wajdeczko@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index bb6fc1e08a52daddd61d95e589cf24685fcd714c..ed079c244b5d775e91a19e30c4ca1da1ce908724 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3085,22 +3085,22 @@ void assert_forcewakes_inactive(struct drm_i915_private *dev_priv);
 
 int intel_wait_for_register(struct drm_i915_private *dev_priv,
                            i915_reg_t reg,
-                           const u32 mask,
-                           const u32 value,
-                           const unsigned long timeout_ms);
+                           u32 mask,
+                           u32 value,
+                           unsigned int timeout_ms);
 int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
                                 i915_reg_t reg,
-                                const u32 mask,
-                                const u32 value,
-                                const unsigned int fast_timeout_us,
-                                const unsigned int slow_timeout_ms,
+                                u32 mask,
+                                u32 value,
+                                unsigned int fast_timeout_us,
+                                unsigned int slow_timeout_ms,
                                 u32 *out_value);
 static inline
 int intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
                               i915_reg_t reg,
-                              const u32 mask,
-                              const u32 value,
-                              const unsigned int timeout_ms)
+                              u32 mask,
+                              u32 value,
+                              unsigned int timeout_ms)
 {
        return __intel_wait_for_register_fw(dev_priv, reg, mask, value,
                                            2, timeout_ms, NULL);

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index ace099381d1161df02fffe2b43d8951b7c0c7cfa..1deb1a4342baa618e34add4a62d4d5f4e9ea1bc4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1610,10 +1610,10 @@ static int gen6_reset_engines(struct drm_i915_private *dev_priv,
  */
 int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
                                 i915_reg_t reg,
-                                const u32 mask,
-                                const u32 value,
-                                const unsigned int fast_timeout_us,
-                                const unsigned int slow_timeout_ms,
+                                u32 mask,
+                                u32 value,
+                                unsigned int fast_timeout_us,
+                                unsigned int slow_timeout_ms,
                                 u32 *out_value)
 {
        u32 reg_value;
@@ -1651,9 +1651,9 @@ int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
  */
 int intel_wait_for_register(struct drm_i915_private *dev_priv,
                            i915_reg_t reg,
-                           const u32 mask,
-                           const u32 value,
-                           const unsigned long timeout_ms)
+                           u32 mask,
+                           u32 value,
+                           unsigned int timeout_ms)
 {
 
        unsigned fw =