summaryrefslogtreecommitdiff
path: root/sys/dev/virtio
diff options
context:
space:
mode:
authoryamaguchi <yamaguchi@NetBSD.org>2021-10-22 02:57:23 +0000
committeryamaguchi <yamaguchi@NetBSD.org>2021-10-22 02:57:23 +0000
commita7561eeb36f1a7d16b210579f8f7d062e32bc8a6 (patch)
tree028587b5a0a67a6ac8b81ebed89ff95371bd075d /sys/dev/virtio
parentf0f0033dd3a38807b0c08805cca28fe260a3a58d (diff)
rename "setup_interrupts" to "alloc_interrupts"
in virtio_mmio and virtio_acpi This should fix build failure on evbarm.
Diffstat (limited to 'sys/dev/virtio')
-rw-r--r--sys/dev/virtio/virtio_mmio.c22
-rw-r--r--sys/dev/virtio/virtio_mmiovar.h4
2 files changed, 18 insertions, 8 deletions
diff --git a/sys/dev/virtio/virtio_mmio.c b/sys/dev/virtio/virtio_mmio.c
index 226be388e50..a5d4580f948 100644
--- a/sys/dev/virtio/virtio_mmio.c
+++ b/sys/dev/virtio/virtio_mmio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio.c,v 1.6 2021/02/05 21:25:36 reinoud Exp $ */
+/* $NetBSD: virtio_mmio.c,v 1.7 2021/10/22 02:57:23 yamaguchi Exp $ */
/* $OpenBSD: virtio_mmio.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */
/*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.6 2021/02/05 21:25:36 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.7 2021/10/22 02:57:23 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,8 +90,9 @@ static uint16_t virtio_mmio_read_queue_size(struct virtio_softc *, uint16_t);
static void virtio_mmio_setup_queue(struct virtio_softc *, uint16_t, uint64_t);
static void virtio_mmio_set_status(struct virtio_softc *, int);
static void virtio_mmio_negotiate_features(struct virtio_softc *, uint64_t);
-static int virtio_mmio_setup_interrupts(struct virtio_softc *);
+static int virtio_mmio_alloc_interrupts(struct virtio_softc *);
static void virtio_mmio_free_interrupts(struct virtio_softc *);
+static int virtio_mmio_setup_interrupts(struct virtio_softc *, int);
static const struct virtio_ops virtio_mmio_ops = {
.kick = virtio_mmio_kick,
@@ -99,8 +100,9 @@ static const struct virtio_ops virtio_mmio_ops = {
.setup_queue = virtio_mmio_setup_queue,
.set_status = virtio_mmio_set_status,
.neg_features = virtio_mmio_negotiate_features,
- .setup_interrupts = virtio_mmio_setup_interrupts,
+ .alloc_interrupts = virtio_mmio_alloc_interrupts,
.free_interrupts = virtio_mmio_free_interrupts,
+ .setup_interrupts = virtio_mmio_setup_interrupts,
};
static uint16_t
@@ -289,11 +291,11 @@ virtio_mmio_kick(struct virtio_softc *vsc, uint16_t idx)
}
static int
-virtio_mmio_setup_interrupts(struct virtio_softc *vsc)
+virtio_mmio_alloc_interrupts(struct virtio_softc *vsc)
{
struct virtio_mmio_softc * const sc = (struct virtio_mmio_softc *)vsc;
- return sc->sc_setup_interrupts(sc);
+ return sc->sc_alloc_interrupts(sc);
}
static void
@@ -303,3 +305,11 @@ virtio_mmio_free_interrupts(struct virtio_softc *vsc)
sc->sc_free_interrupts(sc);
}
+
+static int
+virtio_mmio_setup_interrupts(struct virtio_softc *vsc __unused,
+ int reinit __unused)
+{
+
+ return 0;
+}
diff --git a/sys/dev/virtio/virtio_mmiovar.h b/sys/dev/virtio/virtio_mmiovar.h
index 2b20253357b..d879e7b5035 100644
--- a/sys/dev/virtio/virtio_mmiovar.h
+++ b/sys/dev/virtio/virtio_mmiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmiovar.h,v 1.4 2021/02/05 21:25:36 reinoud Exp $ */
+/* $NetBSD: virtio_mmiovar.h,v 1.5 2021/10/22 02:57:23 yamaguchi Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
* All rights reserved.
@@ -39,7 +39,7 @@ struct virtio_mmio_softc {
void *sc_ih;
- int (*sc_setup_interrupts)(struct virtio_mmio_softc *);
+ int (*sc_alloc_interrupts)(struct virtio_mmio_softc *);
void (*sc_free_interrupts)(struct virtio_mmio_softc *);
};