drm/i915/selftests: Convert timers to use timer_setup()
authorKees Cook <keescook@chromium.org>
Tue, 24 Oct 2017 15:13:44 +0000 (08:13 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 25 Oct 2017 11:13:10 +0000 (12:13 +0100)
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20171024151344.GA104417@beast
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/selftests/lib_sw_fence.c

index 3790fdf44a1ab7feb4429c76d8524ea50926864b..b26f07b55d861c04b45dbad8d56c4ea9cd414540 100644 (file)
@@ -49,9 +49,9 @@ void onstack_fence_fini(struct i915_sw_fence *fence)
        i915_sw_fence_fini(fence);
 }
 
-static void timed_fence_wake(unsigned long data)
+static void timed_fence_wake(struct timer_list *t)
 {
-       struct timed_fence *tf = (struct timed_fence *)data;
+       struct timed_fence *tf = from_timer(tf, t, timer);
 
        i915_sw_fence_commit(&tf->fence);
 }
@@ -60,7 +60,7 @@ void timed_fence_init(struct timed_fence *tf, unsigned long expires)
 {
        onstack_fence_init(&tf->fence);
 
-       setup_timer_on_stack(&tf->timer, timed_fence_wake, (unsigned long)tf);
+       timer_setup_on_stack(&tf->timer, timed_fence_wake, 0);
 
        if (time_after(expires, jiffies))
                mod_timer(&tf->timer, expires);