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/pc98/cbus | |
| 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/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/fdc.c | 12 |
1 files changed, 0 insertions, 12 deletions
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; |
