diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ar/if_ar.c | 8 | ||||
-rw-r--r-- | sys/dev/ce/if_ce.c | 1 | ||||
-rw-r--r-- | sys/dev/cm/smc90cx6.c | 6 | ||||
-rw-r--r-- | sys/dev/cp/if_cp.c | 1 | ||||
-rw-r--r-- | sys/dev/ctau/if_ct.c | 3 | ||||
-rw-r--r-- | sys/dev/cx/if_cx.c | 3 | ||||
-rw-r--r-- | sys/dev/ed/if_ed.c | 6 | ||||
-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 | ||||
-rw-r--r-- | sys/dev/ppc/ppc.c | 8 | ||||
-rw-r--r-- | sys/dev/sr/if_sr.c | 8 | ||||
-rw-r--r-- | sys/dev/wl/if_wl.c | 4 | ||||
-rw-r--r-- | sys/pc98/cbus/fdc.c | 12 |
14 files changed, 0 insertions, 80 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index fbce1d9..35756e4f 100644 --- a/sys/dev/ar/if_ar.c +++ b/sys/dev/ar/if_ar.c @@ -452,29 +452,21 @@ ar_deallocate_resources(device_t device) struct ar_hardc *hc = device_get_softc(device); if (hc->res_irq != 0) { - bus_deactivate_resource(device, SYS_RES_IRQ, - hc->rid_irq, hc->res_irq); bus_release_resource(device, SYS_RES_IRQ, hc->rid_irq, hc->res_irq); hc->res_irq = 0; } if (hc->res_ioport != 0) { - bus_deactivate_resource(device, SYS_RES_IOPORT, - hc->rid_ioport, hc->res_ioport); bus_release_resource(device, SYS_RES_IOPORT, hc->rid_ioport, hc->res_ioport); hc->res_ioport = 0; } if (hc->res_memory != 0) { - bus_deactivate_resource(device, SYS_RES_MEMORY, - hc->rid_memory, hc->res_memory); bus_release_resource(device, SYS_RES_MEMORY, hc->rid_memory, hc->res_memory); hc->res_memory = 0; } if (hc->res_plx_memory != 0) { - bus_deactivate_resource(device, SYS_RES_MEMORY, - hc->rid_plx_memory, hc->res_plx_memory); bus_release_resource(device, SYS_RES_MEMORY, hc->rid_plx_memory, hc->res_plx_memory); hc->res_plx_memory = 0; diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index 7de8e18..048a1a4 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -889,7 +889,6 @@ static int ce_detach (device_t dev) /* Disable the interrupt request. */ bus_teardown_intr (dev, bd->ce_irq, bd->ce_intrhand); - bus_deactivate_resource (dev, SYS_RES_IRQ, 0, bd->ce_irq); bus_release_resource (dev, SYS_RES_IRQ, 0, bd->ce_irq); TAU32_DestructiveHalt (b->ddk.pControllerObject, 0); bus_release_resource (dev, SYS_RES_MEMORY, PCIR_BAR(0), bd->ce_res); diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c index e1722ec..e8645ca 100644 --- a/sys/dev/cm/smc90cx6.c +++ b/sys/dev/cm/smc90cx6.c @@ -139,22 +139,16 @@ cm_release_resources(dev) struct cm_softc *sc = device_get_softc(dev); if (sc->port_res != NULL) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, - 0, sc->port_res); bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->port_res); sc->port_res = NULL; } if (sc->mem_res != NULL) { - bus_deactivate_resource(dev, SYS_RES_MEMORY, - 0, sc->mem_res); bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res); sc->mem_res = NULL; } if (sc->irq_res != NULL) { - bus_deactivate_resource(dev, SYS_RES_IRQ, - 0, sc->irq_res); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c index 95b372a..540f7ab 100644 --- a/sys/dev/cp/if_cp.c +++ b/sys/dev/cp/if_cp.c @@ -650,7 +650,6 @@ static int cp_detach (device_t dev) b->sys = NULL; CP_UNLOCK (bd); - bus_deactivate_resource (dev, SYS_RES_IRQ, 0, bd->cp_irq); bus_release_resource (dev, SYS_RES_IRQ, 0, bd->cp_irq); bus_release_resource (dev, SYS_RES_MEMORY, PCIR_BAR(0), bd->cp_res); diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c index 079017b..7f0bad5 100644 --- a/sys/dev/ctau/if_ct.c +++ b/sys/dev/ctau/if_ct.c @@ -818,13 +818,10 @@ static int ct_detach (device_t dev) CT_UNLOCK (bd); bus_teardown_intr (dev, bd->irq_res, bd->intrhand); - bus_deactivate_resource (dev, SYS_RES_IRQ, bd->irq_rid, bd->irq_res); bus_release_resource (dev, SYS_RES_IRQ, bd->irq_rid, bd->irq_res); - bus_deactivate_resource (dev, SYS_RES_DRQ, bd->drq_rid, bd->drq_res); bus_release_resource (dev, SYS_RES_DRQ, bd->drq_rid, bd->drq_res); - bus_deactivate_resource (dev, SYS_RES_IOPORT, bd->base_rid, bd->irq_res); bus_release_resource (dev, SYS_RES_IOPORT, bd->base_rid, bd->base_res); CT_LOCK (bd); diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c index 7eedee7..2bfbf22 100644 --- a/sys/dev/cx/if_cx.c +++ b/sys/dev/cx/if_cx.c @@ -957,13 +957,10 @@ static int cx_detach (device_t dev) } CX_UNLOCK (bd); bus_teardown_intr (dev, bd->irq_res, bd->intrhand); - bus_deactivate_resource (dev, SYS_RES_IRQ, bd->irq_rid, bd->irq_res); bus_release_resource (dev, SYS_RES_IRQ, bd->irq_rid, bd->irq_res); - bus_deactivate_resource (dev, SYS_RES_DRQ, bd->drq_rid, bd->drq_res); bus_release_resource (dev, SYS_RES_DRQ, bd->drq_rid, bd->drq_res); - bus_deactivate_resource (dev, SYS_RES_IOPORT, bd->base_rid, bd->irq_res); bus_release_resource (dev, SYS_RES_IOPORT, bd->base_rid, bd->base_res); CX_LOCK (bd); diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 1e0ae77..7851825 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -223,22 +223,16 @@ ed_release_resources(device_t dev) struct ed_softc *sc = device_get_softc(dev); if (sc->port_res) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, - sc->port_rid, sc->port_res); bus_release_resource(dev, SYS_RES_IOPORT, sc->port_rid, sc->port_res); sc->port_res = 0; } if (sc->mem_res) { - bus_deactivate_resource(dev, SYS_RES_MEMORY, - sc->mem_rid, sc->mem_res); bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem_res); sc->mem_res = 0; } if (sc->irq_res) { - bus_deactivate_resource(dev, SYS_RES_IRQ, - sc->irq_rid, sc->irq_res); bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); sc->irq_res = 0; 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); diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index b8be53b..6d6e554 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -1779,14 +1779,10 @@ error: ppc->res_irq); } if (ppc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, ppc->rid_ioport, - ppc->res_ioport); bus_release_resource(dev, SYS_RES_IOPORT, ppc->rid_ioport, ppc->res_ioport); } if (ppc->res_drq != 0) { - bus_deactivate_resource(dev, SYS_RES_DRQ, ppc->rid_drq, - ppc->res_drq); bus_release_resource(dev, SYS_RES_DRQ, ppc->rid_drq, ppc->res_drq); } @@ -1856,14 +1852,10 @@ ppc_detach(device_t dev) ppc->res_irq); } if (ppc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, ppc->rid_ioport, - ppc->res_ioport); bus_release_resource(dev, SYS_RES_IOPORT, ppc->rid_ioport, ppc->res_ioport); } if (ppc->res_drq != 0) { - bus_deactivate_resource(dev, SYS_RES_DRQ, ppc->rid_drq, - ppc->res_drq); bus_release_resource(dev, SYS_RES_DRQ, ppc->rid_drq, ppc->res_drq); } diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 1b6b4f3..2711dfe 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -568,29 +568,21 @@ sr_deallocate_resources(device_t device) struct sr_hardc *hc = device_get_softc(device); if (hc->res_irq != 0) { - bus_deactivate_resource(device, SYS_RES_IRQ, - hc->rid_irq, hc->res_irq); bus_release_resource(device, SYS_RES_IRQ, hc->rid_irq, hc->res_irq); hc->res_irq = 0; } if (hc->res_ioport != 0) { - bus_deactivate_resource(device, SYS_RES_IOPORT, - hc->rid_ioport, hc->res_ioport); bus_release_resource(device, SYS_RES_IOPORT, hc->rid_ioport, hc->res_ioport); hc->res_ioport = 0; } if (hc->res_memory != 0) { - bus_deactivate_resource(device, SYS_RES_MEMORY, - hc->rid_memory, hc->res_memory); bus_release_resource(device, SYS_RES_MEMORY, hc->rid_memory, hc->res_memory); hc->res_memory = 0; } if (hc->res_plx_memory != 0) { - bus_deactivate_resource(device, SYS_RES_MEMORY, - hc->rid_plx_memory, hc->res_plx_memory); bus_release_resource(device, SYS_RES_MEMORY, hc->rid_plx_memory, hc->res_plx_memory); hc->res_plx_memory = 0; diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 474235e..17ad81a 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -639,15 +639,11 @@ wl_deallocate_resources(device_t device) struct wl_softc *sc = device_get_softc(device); if (sc->res_irq != 0) { - bus_deactivate_resource(device, SYS_RES_IRQ, - sc->rid_irq, sc->res_irq); bus_release_resource(device, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); sc->res_irq = 0; } if (sc->res_ioport != 0) { - bus_deactivate_resource(device, SYS_RES_IOPORT, - sc->rid_ioport, sc->res_ioport); bus_release_resource(device, SYS_RES_IOPORT, sc->rid_ioport, sc->res_ioport); sc->res_ioport = 0; diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 980622e..8373f45 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -657,16 +657,12 @@ fdc_release_resources(struct fdc_data *fdc) fdc->fdc_intr = NULL; } if (fdc->res_irq != 0) { - bus_deactivate_resource(dev, SYS_RES_IRQ, fdc->rid_irq, - fdc->res_irq); bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq, fdc->res_irq); fdc->res_irq = NULL; } #ifndef PC98 if (fdc->res_ctl != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, - fdc->res_ctl); bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ctl, fdc->res_ctl); fdc->res_ctl = NULL; @@ -674,28 +670,20 @@ fdc_release_resources(struct fdc_data *fdc) #endif #ifdef PC98 if (fdc->res_fdsio != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, 3, - fdc->res_fdsio); bus_release_resource(dev, SYS_RES_IOPORT, 3, fdc->res_fdsio); fdc->res_fdsio = NULL; } if (fdc->res_fdemsio != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, 4, - fdc->res_fdemsio); bus_release_resource(dev, SYS_RES_IOPORT, 4, fdc->res_fdemsio); fdc->res_fdemsio = NULL; } #endif if (fdc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, - fdc->res_ioport); bus_release_resource(dev, SYS_RES_IOPORT, fdc->rid_ioport, fdc->res_ioport); fdc->res_ioport = NULL; } if (fdc->res_drq != 0) { - bus_deactivate_resource(dev, SYS_RES_DRQ, fdc->rid_drq, - fdc->res_drq); bus_release_resource(dev, SYS_RES_DRQ, fdc->rid_drq, fdc->res_drq); fdc->res_drq = NULL; |