[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Use hrtimer_destroy inst...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/339ae3085001
branches:  trunk
changeset: 1028733:339ae3085001
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:53:18 2021 +0000

description:
Use hrtimer_destroy instead of hrtimer_cancel to free


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 3d5fcb8bb54b -r 339ae3085001 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Sun Dec 19 11:53:09 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Sun Dec 19 11:53:18 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_uncore.c,v 1.17 2021/12/19 11:49:11 riastradh Exp $      */
+/*     $NetBSD: intel_uncore.c,v 1.18 2021/12/19 11:53:18 riastradh Exp $      */
 
 /*
  * Copyright © 2013 Intel Corporation
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.17 2021/12/19 11:49:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.18 2021/12/19 11:53:18 riastradh Exp $");
 
 #include <linux/pm_runtime.h>
 #include <asm/iosf_mbi.h>
@@ -1519,6 +1519,7 @@
        uncore->fw_domains &= ~BIT(domain_id);
        WARN_ON(d->wake_count);
        WARN_ON(hrtimer_cancel(&d->timer));
+       hrtimer_destroy(&d->timer);
        kfree(d);
 }