sched/wait: Rename wait_queue_t => wait_queue_entry_t

[thirdparty/linux.git] / drivers / gpu / drm / i915 / i915_sw_fence.c

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index a277f8eb7beb8b5e12d5919275b63163a7ab2c5f..8669bfa33064c6c90b12d80a1aeb6b4a82a934ee 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -152,7 +152,7 @@ static void __i915_sw_fence_wake_up_all(struct i915_sw_fence *fence,
                                        struct list_head *continuation)
 {
        wait_queue_head_t *x = &fence->wait;
-       wait_queue_t *pos, *next;
+       wait_queue_entry_t *pos, *next;
        unsigned long flags;
 
        debug_fence_deactivate(fence);
@@ -254,7 +254,7 @@ void i915_sw_fence_commit(struct i915_sw_fence *fence)
        __i915_sw_fence_commit(fence);
 }
 
-static int i915_sw_fence_wake(wait_queue_t *wq, unsigned mode, int flags, void *key)
+static int i915_sw_fence_wake(wait_queue_entry_t *wq, unsigned mode, int flags, void *key)
 {
        list_del(&wq->task_list);
        __i915_sw_fence_complete(wq->private, key);
@@ -267,7 +267,7 @@ static int i915_sw_fence_wake(wait_queue_t *wq, unsigned mode, int flags, void *
 static bool __i915_sw_fence_check_if_after(struct i915_sw_fence *fence,
                                    const struct i915_sw_fence * const signaler)
 {
-       wait_queue_t *wq;
+       wait_queue_entry_t *wq;
 
        if (__test_and_set_bit(I915_SW_FENCE_CHECKED_BIT, &fence->flags))
                return false;
@@ -288,7 +288,7 @@ static bool __i915_sw_fence_check_if_after(struct i915_sw_fence *fence,
 
 static void __i915_sw_fence_clear_checked_bit(struct i915_sw_fence *fence)
 {
-       wait_queue_t *wq;
+       wait_queue_entry_t *wq;
 
        if (!__test_and_clear_bit(I915_SW_FENCE_CHECKED_BIT, &fence->flags))
                return;
@@ -320,7 +320,7 @@ static bool i915_sw_fence_check_if_after(struct i915_sw_fence *fence,
 
 static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,
                                          struct i915_sw_fence *signaler,
-                                         wait_queue_t *wq, gfp_t gfp)
+                                         wait_queue_entry_t *wq, gfp_t gfp)
 {
        unsigned long flags;
        int pending;
@@ -359,7 +359,7 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,
 
        spin_lock_irqsave(&signaler->wait.lock, flags);
        if (likely(!i915_sw_fence_done(signaler))) {
-               __add_wait_queue_tail(&signaler->wait, wq);
+               __add_wait_queue_entry_tail(&signaler->wait, wq);
                pending = 1;
        } else {
                i915_sw_fence_wake(wq, 0, 0, NULL);
@@ -372,7 +372,7 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,
 
 int i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,
                                 struct i915_sw_fence *signaler,
-                                wait_queue_t *wq)
+                                wait_queue_entry_t *wq)
 {
        return __i915_sw_fence_await_sw_fence(fence, signaler, wq, 0);
 }