[src/trunk]: src/sys/dev/pci virtio(4): Avoid name collision with global intr...

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

details:   https://anonhg.NetBSD.org/src/rev/2c77376aefd5
branches:  trunk
changeset: 374037:2c77376aefd5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Mar 27 10:48:46 2023 +0000

description:
virtio(4): Avoid name collision with global intrhand on sparc64.

Pacifies -Werror=shadow.

No functional change intended.

diffstat:

 sys/dev/pci/virtio.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 4aa39f5c1d60 -r 2c77376aefd5 sys/dev/pci/virtio.c
--- a/sys/dev/pci/virtio.c      Sun Mar 26 19:10:32 2023 +0000
+++ b/sys/dev/pci/virtio.c      Mon Mar 27 10:48:46 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: virtio.c,v 1.69 2023/03/25 02:59:23 yamaguchi Exp $    */
+/*     $NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $    */
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.69 2023/03/25 02:59:23 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -746,7 +746,7 @@ virtio_init_vq_vqdone(struct virtio_soft
 
 void
 virtio_init_vq(struct virtio_softc *sc, struct virtqueue *vq, int index,
-   int (*intrhand)(void *), void *arg)
+   int (*func)(void *), void *arg)
 {
 
        memset(vq, 0, sizeof(*vq));
@@ -754,7 +754,7 @@ virtio_init_vq(struct virtio_softc *sc, 
        vq->vq_owner = sc;
        vq->vq_num = sc->sc_ops->read_queue_size(sc, index);
        vq->vq_index = index;
-       vq->vq_intrhand = intrhand;
+       vq->vq_intrhand = func;
        vq->vq_intrhand_arg = arg;
 }