From: patrick <patrick@openbsd.org>
Date: Wed, 29 Dec 2021 17:52:22 +0000 (+0000)
Subject: acpi_intr_disestablish() is available on all our ACPI platforms which
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f11bc3726111d68a43af505509061ed50b3ba960;p=openbsd

acpi_intr_disestablish() is available on all our ACPI platforms which
support interrupts via ACPI, so there's need for an ifdef around it.

ok kettenis@
---

diff --git a/sys/dev/acpi/dwgpio.c b/sys/dev/acpi/dwgpio.c
index f216fcfbe4f..d08ec9faaf6 100644
--- a/sys/dev/acpi/dwgpio.c
+++ b/sys/dev/acpi/dwgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwgpio.c,v 1.4 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: dwgpio.c,v 1.5 2021/12/29 17:52:22 patrick Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  *
@@ -168,12 +168,10 @@ dwgpio_attach(struct device *parent, struct device *self, void *aux)
 	return;
 
 unmap:
-#ifdef notyet
 	for (i = 0; i < sc->sc_nirq; i++) {
 		if (sc->sc_ih[i])
 			acpi_intr_disestablish(sc->sc_ih[i]);
 	}
-#endif
 	free(sc->sc_ih, M_DEVBUF, sc->sc_nirq * sizeof(*sc->sc_ih));
 	free(sc->sc_pin_ih, M_DEVBUF, sc->sc_npins * sizeof(*sc->sc_pin_ih));
 	bus_space_unmap(sc->sc_memt, sc->sc_memh, aaa->aaa_size[0]);
diff --git a/sys/dev/acpi/if_bse_acpi.c b/sys/dev/acpi/if_bse_acpi.c
index a76dcb9360e..0ee8a185a14 100644
--- a/sys/dev/acpi/if_bse_acpi.c
+++ b/sys/dev/acpi/if_bse_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bse_acpi.c,v 1.4 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: if_bse_acpi.c,v 1.5 2021/12/29 17:52:22 patrick Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  *
@@ -121,9 +121,7 @@ bse_acpi_attach(struct device *parent, struct device *self, void *aux)
 	return;
 
 disestablish:
-#ifdef notyet
 	acpi_intr_disestablish(sc->sc.sc_ih);
-#endif
 unmap:
 	bus_space_unmap(sc->sc.sc_bst, sc->sc.sc_bsh, aaa->aaa_size[0]);
 }
diff --git a/sys/dev/acpi/xhci_acpi.c b/sys/dev/acpi/xhci_acpi.c
index aea9b1f18e7..8ba985157b5 100644
--- a/sys/dev/acpi/xhci_acpi.c
+++ b/sys/dev/acpi/xhci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xhci_acpi.c,v 1.4 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: xhci_acpi.c,v 1.5 2021/12/29 17:52:22 patrick Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -113,9 +113,7 @@ xhci_acpi_attach(struct device *parent, struct device *self, void *aux)
 	return;
 
 disestablish_ret:
-#ifdef notyet
 	acpi_intr_disestablish(sc->sc_ih);
-#endif
 unmap:
 	bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size);
 	return;