diff options
| author | nyan <nyan@FreeBSD.org> | 2007-03-21 03:38:37 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2007-03-21 03:38:37 +0000 |
| commit | 3f9dd9edcb00155dff6a9b7686ce432606296d79 (patch) | |
| tree | 5c965b8611d1f2f75d505701ac1bd411682b8d13 /sys/dev/pcf | |
| parent | 44a4513fbb23c88c7e68606d39119590d7a81382 (diff) | |
| download | FreeBSD-src-3f9dd9edcb00155dff6a9b7686ce432606296d79.zip FreeBSD-src-3f9dd9edcb00155dff6a9b7686ce432606296d79.tar.gz | |
Don't call bus_deactivate_resource() explicitly before calling
bus_release_resource(). This is needed for pc98 by upcoming nexus related
change.
Diffstat (limited to 'sys/dev/pcf')
| -rw-r--r-- | sys/dev/pcf/envctrl.c | 6 | ||||
| -rw-r--r-- | sys/dev/pcf/pcf_ebus.c | 8 | ||||
| -rw-r--r-- | sys/dev/pcf/pcf_isa.c | 6 |
3 files changed, 0 insertions, 20 deletions
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c index 868c553..8c47958 100644 --- a/sys/dev/pcf/envctrl.c +++ b/sys/dev/pcf/envctrl.c @@ -151,14 +151,10 @@ envctrl_attach(device_t dev) error: if (sc->res_irq != 0) { - bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, - sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } if (sc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, - sc->res_ioport); bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); } @@ -181,11 +177,9 @@ envctrl_detach(device_t dev) if (sc->res_irq != 0) { bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); - bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } - bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); return (0); diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c index 14deff8..e53e6d4 100644 --- a/sys/dev/pcf/pcf_ebus.c +++ b/sys/dev/pcf/pcf_ebus.c @@ -212,14 +212,10 @@ pcf_ebus_attach(device_t dev) error: if (sc->res_irq != 0) { - bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, - sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } if (sc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, - sc->res_ioport); bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); } @@ -243,14 +239,10 @@ pcf_ebus_detach(device_t dev) if (sc->res_irq != 0) { bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); - bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, - sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } - bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, - sc->res_ioport); bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c index 2850d54..40064cc 100644 --- a/sys/dev/pcf/pcf_isa.c +++ b/sys/dev/pcf/pcf_isa.c @@ -172,14 +172,10 @@ pcf_isa_attach(device_t dev) error: if (sc->res_irq != 0) { - bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, - sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } if (sc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, - sc->res_ioport); bus_release_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, sc->res_ioport); } @@ -202,11 +198,9 @@ pcf_isa_detach(device_t dev) if (sc->res_irq != 0) { bus_teardown_intr(dev, sc->res_irq, sc->intr_cookie); - bus_deactivate_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } - bus_deactivate_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, sc->res_ioport); bus_release_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, sc->res_ioport); return (0); |
