[src/trunk]: src/sys/arch/arm/cortex Fix non-DIAGNOSTIC builds (hopefully). N...

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

details:   https://anonhg.NetBSD.org/src/rev/09374cdf57f2
branches:  trunk
changeset: 990632:09374cdf57f2
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Oct 31 17:24:11 2021 +0000

description:
Fix non-DIAGNOSTIC builds (hopefully). No idea why this didn't fail to
build for me without DIAGNOSTIC.

diffstat:

 sys/arch/arm/cortex/gicv3_its.c |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 6a00d0f933ea -r 09374cdf57f2 sys/arch/arm/cortex/gicv3_its.c
--- a/sys/arch/arm/cortex/gicv3_its.c   Sun Oct 31 17:22:47 2021 +0000
+++ b/sys/arch/arm/cortex/gicv3_its.c   Sun Oct 31 17:24:11 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.33 2021/10/31 16:23:47 skrll Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.34 2021/10/31 17:24:11 skrll Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.33 2021/10/31 16:23:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.34 2021/10/31 17:24:11 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -589,7 +589,6 @@
     pci_intr_handle_t ih, int ipl, int (*func)(void *), void *arg, const char *xname)
 {
        struct gicv3_its * const its = msi->msi_priv;
-       const struct pci_attach_args *pa;
        void *intrh;
 
        const int lpi = __SHIFTOUT(ih, ARM_PCI_INTR_IRQ);
@@ -601,8 +600,7 @@
                return NULL;
 
        /* Invalidate LPI configuration tables */
-       pa = its->its_pa[lpi - its->its_pic->pic_irqbase];
-       KASSERT(pa != NULL);
+       KASSERT(its->its_pa[lpi - its->its_pic->pic_irqbase] != NULL);
        const uint32_t devid = its->its_devid[lpi - its->its_pic->pic_irqbase];
        gits_command_inv(its, devid, lpi - its->its_pic->pic_irqbase);
 
@@ -771,7 +769,6 @@
 {
        struct gicv3_its * const its = priv;
        struct gicv3_softc * const sc = its->its_gic;
-       const struct pci_attach_args *pa;
        uint64_t rdbase;
        size_t irq;
 
@@ -798,8 +795,7 @@
        for (irq = 0; irq < its->its_pic->pic_maxsources; irq++) {
                if (its->its_targets[irq] != ci)
                        continue;
-               pa = its->its_pa[irq];
-               KASSERT(pa != NULL);
+               KASSERT(its->its_pa[irq] != NULL);
 
                const uint32_t devid = its->its_devid[irq];
                gits_command_movi(its, devid, irq, cpu_index(ci));