summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2013-05-21 20:03:18 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-05-22 13:51:20 +0200
commit2554fc1fa6dc184ca553f73e3796fa59745efa8a (patch)
tree39209dda2258677d5552b93b8a3808bf69cc1cf8 /drivers
parentdf97729f1bcb5055ba414f08b48364d46c6baef0 (diff)
downloadlinux-3.10-2554fc1fa6dc184ca553f73e3796fa59745efa8a.tar.gz
linux-3.10-2554fc1fa6dc184ca553f73e3796fa59745efa8a.tar.bz2
linux-3.10-2554fc1fa6dc184ca553f73e3796fa59745efa8a.zip
drm/i915: use msecs_to_jiffies_timeout instead of open coding the same
Signed-off-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 5d245031e39..98cd85352d9 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -228,7 +228,7 @@ gmbus_wait_hw_status(struct drm_i915_private *dev_priv,
* need to wake up periodically and check that ourselves. */
I915_WRITE(GMBUS4 + reg_offset, gmbus4_irq_en);
- for (i = 0; i < msecs_to_jiffies(50) + 1; i++) {
+ for (i = 0; i < msecs_to_jiffies_timeout(50); i++) {
prepare_to_wait(&dev_priv->gmbus_wait_queue, &wait,
TASK_UNINTERRUPTIBLE);