diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-24 17:12:32 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-24 17:12:32 +0000 |
| commit | f9be7298243478ab375c6df63421bdf8de2795fb (patch) | |
| tree | 881de55134769c2e29cc68c42a58e83851702d4d /sys/dev/fdt | |
| parent | e9d71dae5ab68ababf95bfdde64510e41cfe6af1 (diff) | |
The interrupts have been established using the FDT interrupt API, so we
need to use the FDT interrupt API do disestablish them.
ok kettenis@
Diffstat (limited to 'sys/dev/fdt')
| -rw-r--r-- | sys/dev/fdt/ahci_fdt.c | 4 | ||||
| -rw-r--r-- | sys/dev/fdt/sxiehci.c | 6 | ||||
| -rw-r--r-- | sys/dev/fdt/virtio_mmio.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/fdt/ahci_fdt.c b/sys/dev/fdt/ahci_fdt.c index 2bb30814f82..fbf5546fe9e 100644 --- a/sys/dev/fdt/ahci_fdt.c +++ b/sys/dev/fdt/ahci_fdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci_fdt.c,v 1.1 2017/02/22 23:01:15 patrick Exp $ */ +/* $OpenBSD: ahci_fdt.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */ /* * Copyright (c) 2013,2017 Patrick Wildt <patrick@blueri.se> * @@ -89,7 +89,7 @@ ahci_fdt_attach(struct device *parent, struct device *self, void *aux) return; irq: - arm_intr_disestablish(sc->sc_ih); + arm_intr_disestablish_fdt(sc->sc_ih); unmap: bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_ios); } diff --git a/sys/dev/fdt/sxiehci.c b/sys/dev/fdt/sxiehci.c index 592387e6b67..00efbf7f99a 100644 --- a/sys/dev/fdt/sxiehci.c +++ b/sys/dev/fdt/sxiehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxiehci.c,v 1.1 2017/01/21 08:26:49 patrick Exp $ */ +/* $OpenBSD: sxiehci.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -179,7 +179,7 @@ sxiehci_attach(struct device *parent, struct device *self, void *aux) goto out; intr: - arm_intr_disestablish(sc->sc_ih); + arm_intr_disestablish_fdt(sc->sc_ih); sc->sc_ih = NULL; mem0: bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size); @@ -280,7 +280,7 @@ sxiehci_detach(struct device *self, int flags) return (rv); if (sc->sc_ih != NULL) { - arm_intr_disestablish(sc->sc_ih); + arm_intr_disestablish_fdt(sc->sc_ih); sc->sc_ih = NULL; } diff --git a/sys/dev/fdt/virtio_mmio.c b/sys/dev/fdt/virtio_mmio.c index cf00276dd0f..bc588a9a99a 100644 --- a/sys/dev/fdt/virtio_mmio.c +++ b/sys/dev/fdt/virtio_mmio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio_mmio.c,v 1.1 2017/01/26 01:46:19 jsg Exp $ */ +/* $OpenBSD: virtio_mmio.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -286,7 +286,7 @@ virtio_mmio_detach(struct device *self, int flags) } KASSERT(vsc->sc_child == 0 || vsc->sc_child == VIRTIO_CHILD_ERROR); KASSERT(vsc->sc_vqs == 0); - arm_intr_disestablish(sc->sc_ih); + arm_intr_disestablish_fdt(sc->sc_ih); sc->sc_ih = 0; if (sc->sc_iosize) bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize); |