summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_utils.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2021-01-07 15:35:40 +0300
committerChris Wilson <chris@chris-wilson.co.uk>2021-01-08 00:37:14 +0300
commitc185a16eceae8c9ea29602a3af0cb3071d32af6e (patch)
treed91714b8d2b9e36d7c9fef26ab8c3c6c4d1068ea /drivers/gpu/drm/i915/i915_utils.c
parent88b39600da3abcf5ef5a704fc028d52a2840011a (diff)
downloadlinux-c185a16eceae8c9ea29602a3af0cb3071d32af6e.tar.xz
drm/i915: Wrap our timer_list.expires checking
Refactor our timer_list.expires checking into its own timer_active() helper. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210107123541.17153-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_utils.c')
-rw-r--r--drivers/gpu/drm/i915/i915_utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
index 4c305d838016..f9e780dee9de 100644
--- a/drivers/gpu/drm/i915/i915_utils.c
+++ b/drivers/gpu/drm/i915/i915_utils.c
@@ -87,7 +87,7 @@ bool i915_error_injected(void)
void cancel_timer(struct timer_list *t)
{
- if (!READ_ONCE(t->expires))
+ if (!timer_active(t))
return;
del_timer(t);