summaryrefslogtreecommitdiff
path: root/sys/dev/pcf
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2007-03-21 03:38:37 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2007-03-21 03:38:37 +0000
commit41f5bd0f6dc8a92fde5135b6c674e35d4b96501e (patch)
tree5c965b8611d1f2f75d505701ac1bd411682b8d13 /sys/dev/pcf
parent4eaa43e6f4518e4b81e5b18e160ed2f177b749a9 (diff)
Notes
Diffstat (limited to 'sys/dev/pcf')
-rw-r--r--sys/dev/pcf/envctrl.c6
-rw-r--r--sys/dev/pcf/pcf_ebus.c8
-rw-r--r--sys/dev/pcf/pcf_isa.c6
3 files changed, 0 insertions, 20 deletions
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c
index 868c55348f57..8c4795867881 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 14deff8d5e2c..e53e6d47fe0d 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 2850d54a23e9..40064cc74bc3 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);