drm/i915: Fix type of timeout_ms parameter in intel_wait_for_register_fw()

There is no need to specify timeout as unsigned long since this parameter
will be consumed by usecs_to_jiffies() which expects unsigned int only.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170407133212.174608-1-michal.wajdeczko@intel.com
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
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 f990f0eff95cc309f5ceb016ca3f41cd03428185..59433df46859fdeed05f98f0cd5b96e28d661ee0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3092,7 +3092,7 @@ int intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
                               i915_reg_t reg,
                               const u32 mask,
                               const u32 value,
-                              const unsigned long timeout_ms);
+                              const unsigned int timeout_ms);
 
 static inline bool intel_gvt_active(struct drm_i915_private *dev_priv)
 {

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 6d1ea26b2493baba7ac075b2594b6a6fae20b060..bcabf54ef854439a10cb72d9607944d4ccfce157 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1610,7 +1610,7 @@ int intel_wait_for_register_fw(struct drm_i915_private *dev_priv,
                               i915_reg_t reg,
                               const u32 mask,
                               const u32 value,
-                              const unsigned long timeout_ms)
+                              const unsigned int timeout_ms)
 {
 #define done ((I915_READ_FW(reg) & mask) == value)
        int ret = wait_for_us(done, 2);