drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE

Less yelling ftw!

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 9236ef1de270..694b9954cbbc 100644
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
@@ -338,7 +338,7 @@ via_dmablit_handler(struct drm_device *dev, int engine, int from_irq)
 
                 blitq->blits[cur]->aborted = blitq->aborting;
                 blitq->done_blit_handle++;
-                DRM_WAKEUP(blitq->blit_queue + cur);
+                wake_up(blitq->blit_queue + cur);
 
                 cur++;
                 if (cur >= VIA_NUM_BLIT_SLOTS)
@@ -521,7 +521,7 @@ via_dmablit_workqueue(struct work_struct *work)
 
                 spin_unlock_irqrestore(&blitq->blit_lock, irqsave);
 
-                DRM_WAKEUP(&blitq->busy_queue);
+                wake_up(&blitq->busy_queue);
 
                 via_free_sg_info(dev->pdev, cur_sg);
                 kfree(cur_sg);
@@ -561,8 +561,8 @@ via_init_dmablit(struct drm_device *dev)
                 blitq->aborting = 0;
                 spin_lock_init(&blitq->blit_lock);
                 for (j = 0; j < VIA_NUM_BLIT_SLOTS; ++j)
-                        DRM_INIT_WAITQUEUE(blitq->blit_queue + j);
-                DRM_INIT_WAITQUEUE(&blitq->busy_queue);
+                        init_waitqueue_head(blitq->blit_queue + j);
+                init_waitqueue_head(&blitq->busy_queue);
                 INIT_WORK(&blitq->wq, via_dmablit_workqueue);
                 setup_timer(&blitq->poll_timer, via_dmablit_timer,
                                 (unsigned long)blitq);
@@ -713,7 +713,7 @@ via_dmablit_release_slot(drm_via_blitq_t *blitq)
         spin_lock_irqsave(&blitq->blit_lock, irqsave);
         blitq->num_free++;
         spin_unlock_irqrestore(&blitq->blit_lock, irqsave);
-        DRM_WAKEUP(&blitq->busy_queue);
+        wake_up(&blitq->busy_queue);
 }
 
 /*
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index 85a4cb955204..1319433816d3 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
         for (i = 0; i < dev_priv->num_irqs; ++i) {
                 if (status & cur_irq->pending_mask) {
                         atomic_inc(&cur_irq->irq_received);
-                        DRM_WAKEUP(&cur_irq->irq_queue);
+                        wake_up(&cur_irq->irq_queue);
                         handled = 1;
                         if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
                                 via_dmablit_handler(dev, 0, 1);
@@ -287,7 +287,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
                         atomic_set(&cur_irq->irq_received, 0);
                         cur_irq->enable_mask = dev_priv->irq_masks[i][0];
                         cur_irq->pending_mask = dev_priv->irq_masks[i][1];
-                        DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
+                        init_waitqueue_head(&cur_irq->irq_queue);
                         dev_priv->irq_enable_mask |= cur_irq->enable_mask;
                         dev_priv->irq_pending_mask |= cur_irq->pending_mask;
                         cur_irq++;
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index f60cfb654428..a9ffbad1cfdd 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
@@ -36,7 +36,7 @@ void via_init_futex(drm_via_private_t *dev_priv)
         DRM_DEBUG("\n");
 
         for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
-                DRM_INIT_WAITQUEUE(&(dev_priv->decoder_queue[i]));
+                init_waitqueue_head(&(dev_priv->decoder_queue[i]));
                 XVMCLOCKPTR(dev_priv->sarea_priv, i)->lock = 0;
         }
 }
@@ -58,7 +58,7 @@ void via_release_futex(drm_via_private_t *dev_priv, int context)
                 if ((_DRM_LOCKING_CONTEXT(*lock) == context)) {
                         if (_DRM_LOCK_IS_HELD(*lock)
                             && (*lock & _DRM_LOCK_CONT)) {
-                                DRM_WAKEUP(&(dev_priv->decoder_queue[i]));
+                                wake_up(&(dev_priv->decoder_queue[i]));
                         }
                         *lock = 0;
                 }
@@ -86,7 +86,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_
                             (fx->ms / 10) * (HZ / 100), *lock != fx->val);
                 return ret;
         case VIA_FUTEX_WAKE:
-                DRM_WAKEUP(&(dev_priv->decoder_queue[fx->lock]));
+                wake_up(&(dev_priv->decoder_queue[fx->lock]));
                 return 0;
         }
         return 0;