Commit 3fc7d86b authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson

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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Suggested-by: default avatarJoonas 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.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent bcc36d8a
...@@ -3085,22 +3085,22 @@ void assert_forcewakes_inactive(struct drm_i915_private *dev_priv); ...@@ -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, int intel_wait_for_register(struct drm_i915_private *dev_priv,
i915_reg_t reg, i915_reg_t reg,
const u32 mask, u32 mask,
const u32 value, u32 value,
const unsigned long timeout_ms); unsigned int timeout_ms);
int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv, int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
i915_reg_t reg, i915_reg_t reg,
const u32 mask, u32 mask,
const u32 value, u32 value,
const unsigned int fast_timeout_us, unsigned int fast_timeout_us,
const unsigned int slow_timeout_ms, unsigned int slow_timeout_ms,
u32 *out_value); u32 *out_value);
static inline static inline
int intel_wait_for_register_fw(struct drm_i915_private *dev_priv, int intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
i915_reg_t reg, i915_reg_t reg,
const u32 mask, u32 mask,
const u32 value, u32 value,
const unsigned int timeout_ms) unsigned int timeout_ms)
{ {
return __intel_wait_for_register_fw(dev_priv, reg, mask, value, return __intel_wait_for_register_fw(dev_priv, reg, mask, value,
2, timeout_ms, NULL); 2, timeout_ms, NULL);
......
...@@ -1610,10 +1610,10 @@ static int gen6_reset_engines(struct drm_i915_private *dev_priv, ...@@ -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, int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
i915_reg_t reg, i915_reg_t reg,
const u32 mask, u32 mask,
const u32 value, u32 value,
const unsigned int fast_timeout_us, unsigned int fast_timeout_us,
const unsigned int slow_timeout_ms, unsigned int slow_timeout_ms,
u32 *out_value) u32 *out_value)
{ {
u32 reg_value; u32 reg_value;
...@@ -1651,9 +1651,9 @@ int __intel_wait_for_register_fw(struct drm_i915_private *dev_priv, ...@@ -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, int intel_wait_for_register(struct drm_i915_private *dev_priv,
i915_reg_t reg, i915_reg_t reg,
const u32 mask, u32 mask,
const u32 value, u32 value,
const unsigned long timeout_ms) unsigned int timeout_ms)
{ {
unsigned fw = unsigned fw =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment