Module Name: src
Committed By: jmcneill
Date: Fri Nov 23 14:08:40 UTC 2018
Modified Files:
src/sys/dev/acpi: plgpio_acpi.c
Log Message:
Use acpi_intr_establish
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/plgpio_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/plgpio_acpi.c
diff -u src/sys/dev/acpi/plgpio_acpi.c:1.4 src/sys/dev/acpi/plgpio_acpi.c:1.5
--- src/sys/dev/acpi/plgpio_acpi.c:1.4 Tue Oct 23 09:19:02 2018
+++ src/sys/dev/acpi/plgpio_acpi.c Fri Nov 23 14:08:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: plgpio_acpi.c,v 1.4 2018/10/23 09:19:02 jmcneill Exp $ */
+/* $NetBSD: plgpio_acpi.c,v 1.5 2018/11/23 14:08:40 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.c,v 1.4 2018/10/23 09:19:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.c,v 1.5 2018/11/23 14:08:40 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#include <dev/acpi/acpi_intr.h>
#include <dev/acpi/acpi_event.h>
#include <dev/gpio/gpiovar.h>
@@ -108,7 +109,7 @@ plgpio_acpi_attach(device_t parent, devi
}
irq = acpi_res_irq(&res, 0);
- if (mem == NULL) {
+ if (irq == NULL) {
aprint_error_dev(self, "couldn't find irq resource\n");
goto done;
}
@@ -130,8 +131,8 @@ plgpio_acpi_attach(device_t parent, devi
goto done;
}
- const int type = (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL;
- ih = intr_establish(irq->ar_irq, IPL_VM, type, plgpio_acpi_intr, asc);
+ ih = acpi_intr_establish(self, (uint64_t)asc->sc_handle,
+ IPL_VM, false, plgpio_acpi_intr, asc, device_xname(self));
if (ih == NULL)
aprint_error_dev(self, "couldn't establish interrupt\n");
