13 files changed, 20 insertions, 20 deletions

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 64c34d5876ff..b52ff052b785 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -960,7 +960,7 @@ void drm_vblank_put(struct drm_device *dev, int crtc)
         if (atomic_dec_and_test(&dev->vblank[crtc].refcount) &&
             (drm_vblank_offdelay > 0))
                 mod_timer(&dev->vblank_disable_timer,
-                          jiffies + ((drm_vblank_offdelay * DRM_HZ)/1000));
+                          jiffies + ((drm_vblank_offdelay * HZ)/1000));
 }
 EXPORT_SYMBOL(drm_vblank_put);
 
@@ -1244,7 +1244,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
         DRM_DEBUG("waiting on vblank count %d, crtc %d\n",
                   vblwait->request.sequence, crtc);
         dev->vblank[crtc].last_wait = vblwait->request.sequence;
-        DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * DRM_HZ,
+        DRM_WAIT_ON(ret, dev->vblank[crtc].queue, 3 * HZ,
                     (((drm_vblank_count(dev, crtc) -
                        vblwait->request.sequence) <= (1 << 23)) ||
                      !dev->irq_enabled));
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 63bc5f92fbb3..1433300565e5 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -868,7 +868,7 @@ static void mixer_wait_for_vblank(void *ctx)
          */
         if (!wait_event_timeout(mixer_ctx->wait_vsync_queue,
                                 !atomic_read(&mixer_ctx->wait_vsync_event),
-                                DRM_HZ/20))
+                                HZ/20))
                 DRM_DEBUG_KMS("vblank wait timed out.\n");
 }
 
diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c
index d5ef1a5793c8..de6f62a6ceb7 100644
--- a/drivers/gpu/drm/gma500/accel_2d.c
+++ b/drivers/gpu/drm/gma500/accel_2d.c
@@ -326,7 +326,7 @@ int psbfb_sync(struct fb_info *info)
         struct psb_framebuffer *psbfb = &fbdev->pfb;
         struct drm_device *dev = psbfb->base.dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long _end = jiffies + DRM_HZ;
+        unsigned long _end = jiffies + HZ;
         int busy = 0;
         unsigned long flags;
 
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index b59e6588c343..8d2a395edbd2 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -212,8 +212,8 @@ enum {
 #define PSB_HIGH_REG_OFFS 0x0600
 
 #define PSB_NUM_VBLANKS 2
-#define PSB_WATCHDOG_DELAY (DRM_HZ * 2)
-#define PSB_LID_DELAY (DRM_HZ / 10)
+#define PSB_WATCHDOG_DELAY (HZ * 2)
+#define PSB_LID_DELAY (HZ / 10)
 
 #define MDFLD_PNW_B0 0x04
 #define MDFLD_PNW_C0 0x08
@@ -232,7 +232,7 @@ enum {
 #define MDFLD_DSR_RR            45
 #define MDFLD_DPU_ENABLE        (1 << 31)
 #define MDFLD_DSR_FULLSCREEN    (1 << 30)
-#define MDFLD_DSR_DELAY         (DRM_HZ / MDFLD_DSR_RR)
+#define MDFLD_DSR_DELAY         (HZ / MDFLD_DSR_RR)
 
 #define PSB_PWR_STATE_ON                1
 #define PSB_PWR_STATE_OFF               2
diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c
index ba4830342d34..76224721177e 100644
--- a/drivers/gpu/drm/gma500/psb_irq.c
+++ b/drivers/gpu/drm/gma500/psb_irq.c
@@ -456,7 +456,7 @@ static int psb_vblank_do_wait(struct drm_device *dev,
 {
         unsigned int cur_vblank;
         int ret = 0;
-        DRM_WAIT_ON(ret, dev->vblank.queue, 3 * DRM_HZ,
+        DRM_WAIT_ON(ret, dev->vblank.queue, 3 * HZ,
                     (((cur_vblank = atomic_read(counter))
                       - *sequence) <= (1 << 23)));
         *sequence = cur_vblank;
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 7eefc17ab69c..4c18dfcf67d3 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -783,7 +783,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
                 master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
 
         if (ring->irq_get(ring)) {
-                DRM_WAIT_ON(ret, ring->irq_queue, 3 * DRM_HZ,
+                DRM_WAIT_ON(ret, ring->irq_queue, 3 * HZ,
                             READ_BREADCRUMB(dev_priv) >= irq_nr);
                 ring->irq_put(ring);
         } else if (wait_for(READ_BREADCRUMB(dev_priv) >= irq_nr, 3000))
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
index 2b0ceb8dc11b..8a92edb6bd61 100644
--- a/drivers/gpu/drm/mga/mga_irq.c
+++ b/drivers/gpu/drm/mga/mga_irq.c
@@ -128,7 +128,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
          * by about a day rather than she wants to wait for years
          * using fences.
          */
-        DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
+        DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
                     (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
                       - *sequence) <= (1 << 23)));
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 40cf52e6d6d2..90074d620e31 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -143,7 +143,7 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan)
         int ret;
 
         fence->channel  = chan;
-        fence->timeout  = jiffies + (15 * DRM_HZ);
+        fence->timeout  = jiffies + (15 * HZ);
         fence->sequence = ++fctx->sequence;
 
         ret = fctx->emit(fence);
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
index 8d68e972789a..0b69d6ab869d 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
@@ -249,7 +249,7 @@ static int radeon_wait_irq(struct drm_device * dev, int swi_nr)
 
         dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
 
-        DRM_WAIT_ON(ret, dev_priv->swi_queue, 3 * DRM_HZ,
+        DRM_WAIT_ON(ret, dev_priv->swi_queue, 3 * HZ,
                     RADEON_READ(RADEON_LAST_SWI_REG) >= swi_nr);
 
         return ret;
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 01857d836350..0573be0d2933 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -266,7 +266,7 @@ int sis_idle(struct drm_device *dev)
          * because its polling frequency is too low.
          */
 
-        end = jiffies + (DRM_HZ * 3);
+        end = jiffies + (HZ * 3);
 
         for (i = 0; i < 4; ++i) {
                 do {
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 8b0f25904e6d..9236ef1de270 100644
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
@@ -363,7 +363,7 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq)
 
                 via_abort_dmablit(dev, engine);
                 blitq->aborting = 1;
-                blitq->end = jiffies + DRM_HZ;
+                blitq->end = jiffies + HZ;
         }
 
         if (!blitq->is_active) {
@@ -372,7 +372,7 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq)
                         blitq->is_active = 1;
                         blitq->cur = cur;
                         blitq->num_outstanding--;
-                        blitq->end = jiffies + DRM_HZ;
+                        blitq->end = jiffies + HZ;
                         if (!timer_pending(&blitq->poll_timer))
                                 mod_timer(&blitq->poll_timer, jiffies + 1);
                 } else {
@@ -436,7 +436,7 @@ via_dmablit_sync(struct drm_device *dev, uint32_t handle, int engine)
         int ret = 0;
 
         if (via_dmablit_active(blitq, engine, handle, &queue)) {
-                DRM_WAIT_ON(ret, *queue, 3 * DRM_HZ,
+                DRM_WAIT_ON(ret, *queue, 3 * HZ,
                             !via_dmablit_active(blitq, engine, handle, NULL));
         }
         DRM_DEBUG("DMA blit sync handle 0x%x engine %d returned %d\n",
@@ -688,7 +688,7 @@ via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine)
         while (blitq->num_free == 0) {
                 spin_unlock_irqrestore(&blitq->blit_lock, irqsave);
 
-                DRM_WAIT_ON(ret, blitq->busy_queue, DRM_HZ, blitq->num_free > 0);
+                DRM_WAIT_ON(ret, blitq->busy_queue, HZ, blitq->num_free > 0);
                 if (ret)
                         return (-EINTR == ret) ? -EAGAIN : ret;
 
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index ac98964297cf..d0e2b988d067 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -239,12 +239,12 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
         cur_irq = dev_priv->via_irqs + real_irq;
 
         if (masks[real_irq][2] && !force_sequence) {
-                DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
+                DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
                             ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
                              masks[irq][4]));
                 cur_irq_sequence = atomic_read(&cur_irq->irq_received);
         } else {
-                DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
+                DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
                             (((cur_irq_sequence =
                                atomic_read(&cur_irq->irq_received)) -
                               *sequence) <= (1 << 23)));
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index 6569efa2ff6e..f60cfb654428 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
@@ -83,7 +83,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_
         switch (fx->func) {
         case VIA_FUTEX_WAIT:
                 DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
-                            (fx->ms / 10) * (DRM_HZ / 100), *lock != fx->val);
+                            (fx->ms / 10) * (HZ / 100), *lock != fx->val);
                 return ret;
         case VIA_FUTEX_WAKE:
                 DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock]));