> Date: Wed, 29 Dec 2021 18:36:16 +0100
> From: Patrick Wildt <[email protected]>
>
> On Wed, Dec 29, 2021 at 06:02:02PM +0100, Mark Kettenis wrote:
> >
> > We have acpi_intr_disestablish() on arm64 now...
> >
>
> Actually we also have it on amd64 now, so maybe we should start by
> removing all those ifdefs? Then there'll be less cargo-culting.
>
> ok?
yeah, ok kettenis@
> diff --git a/sys/dev/acpi/dwgpio.c b/sys/dev/acpi/dwgpio.c
> index f216fcfbe4f..1b409caa239 100644
> --- a/sys/dev/acpi/dwgpio.c
> +++ b/sys/dev/acpi/dwgpio.c
> @@ -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..a9a87c3e7f6 100644
> --- a/sys/dev/acpi/if_bse_acpi.c
> +++ b/sys/dev/acpi/if_bse_acpi.c
> @@ -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..c382bd3dd19 100644
> --- a/sys/dev/acpi/xhci_acpi.c
> +++ b/sys/dev/acpi/xhci_acpi.c
> @@ -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;
>
