summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2020-10-23 11:00:09 +0000
committerjmcneill <jmcneill@NetBSD.org>2020-10-23 11:00:09 +0000
commitb8d0963777ffbf897450ce23227e7a26b7249c63 (patch)
tree45e22ec32eb82c290f8b62f5d33f95326e17e00f /sys/dev
parent53eb8527be379a88ff6baca00f518bde63eeb9d3 (diff)
Use MI acpi_intr_establish_irq instead of MD intr_establish
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_ged.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpi_ged.c b/sys/dev/acpi/acpi_ged.c
index 40e142287d5..3c68a5062be 100644
--- a/sys/dev/acpi/acpi_ged.c
+++ b/sys/dev/acpi/acpi_ged.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ged.c,v 1.1 2018/10/22 22:36:19 jmcneill Exp $ */
+/* $NetBSD: acpi_ged.c,v 1.2 2020/10/23 11:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ged.c,v 1.1 2018/10/22 22:36:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ged.c,v 1.2 2020/10/23 11:00:09 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_ged.c,v 1.1 2018/10/22 22:36:19 jmcneill Exp $"
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_event.h>
+#include <dev/acpi/acpi_intr.h>
static int acpi_ged_match(device_t, cfdata_t, void *);
static void acpi_ged_attach(device_t, device_t, void *);
@@ -83,8 +84,8 @@ acpi_ged_register_event(void *priv, struct acpi_event *ev, struct acpi_irq *irq)
device_t dev = priv;
void *ih;
- const int type = (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL;
- ih = intr_establish(irq->ar_irq, IPL_VM, type, acpi_ged_intr, ev);
+ ih = acpi_intr_establish_irq(dev, irq, IPL_VM, true,
+ acpi_ged_intr, ev, device_xname(dev));
if (ih == NULL) {
aprint_error_dev(dev, "couldn't establish interrupt (irq %d)\n", irq->ar_irq);
return;