[src/trunk]: src/sys/external/bsd/drm2/i915drm i915: Mark a KASSERT-only vari...

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

details:   https://anonhg.NetBSD.org/src/rev/0b2be7f95c45
branches:  trunk
changeset: 1029065:0b2be7f95c45
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Dec 20 14:52:25 2021 +0000

description:
i915: Mark a KASSERT-only variable __diagused.

Minor KNF fix while here.

diffstat:

 sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 2f9b7cfe6eed -r 0b2be7f95c45 sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Mon Dec 20 14:41:26 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Mon Dec 20 14:52:25 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci_autoconf.c,v 1.10 2021/12/19 12:28:12 riastradh Exp $ */
+/*     $NetBSD: i915_pci_autoconf.c,v 1.11 2021/12/20 14:52:25 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.10 2021/12/19 12:28:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.11 2021/12/20 14:52:25 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
@@ -104,7 +104,8 @@
                return NULL;
 
        const struct pci_device_id *ent = &i915_device_ids[i];
-       const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
+       const struct intel_device_info *const info =
+           (struct intel_device_info *)ent->driver_data;
 
        if (info->require_force_probe) {
                printf("i915drmkms: preliminary hardware support disabled\n");
@@ -171,7 +172,8 @@
        struct i915drmkms_softc *const sc = device_private(self);
        struct pci_attach_args *const pa = &sc->sc_pa;
        const struct pci_device_id *ent = i915drmkms_pci_lookup(pa);
-       const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
+       const struct intel_device_info *const info __diagused =
+           (struct intel_device_info *)ent->driver_data;
        int error;
 
        KASSERT(info != NULL);