diff options
author | imp <imp@FreeBSD.org> | 2005-09-20 19:46:54 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-09-20 19:46:54 +0000 |
commit | aaf30390958780e52006570cfed624d13098ec92 (patch) | |
tree | 880c293f23c96cae78e03d4357ed4280dc720f93 /sys/dev | |
parent | 2b6cd2aa2caca5768eddb6ef156529db487519d4 (diff) | |
download | FreeBSD-src-aaf30390958780e52006570cfed624d13098ec92.zip FreeBSD-src-aaf30390958780e52006570cfed624d13098ec92.tar.gz |
Remove support for oldcard by removing compat shims.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/awi/if_awi_pccard.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c index 0e4958c..5f228b8 100644 --- a/sys/dev/awi/if_awi_pccard.c +++ b/sys/dev/awi/if_awi_pccard.c @@ -81,7 +81,6 @@ static const struct pccard_product awi_pccard_products[] = { { NULL } }; -static int awi_pccard_match(device_t); static int awi_pccard_probe(device_t); static int awi_pccard_attach(device_t); static int awi_pccard_detach(device_t); @@ -90,7 +89,7 @@ static int awi_pccard_enable(struct awi_softc *); static void awi_pccard_disable(struct awi_softc *); static int -awi_pccard_match(device_t dev) +awi_pccard_probe(device_t dev) { const struct pccard_product *pp; @@ -107,7 +106,7 @@ awi_pccard_match(device_t dev) * Initialize the device - called from Slot manager. */ static int -awi_pccard_probe(device_t dev) +awi_pccard_attach(device_t dev) { struct awi_pccard_softc *psc = device_get_softc(dev); struct awi_softc *sc = &psc->sc_awi; @@ -132,21 +131,7 @@ awi_pccard_probe(device_t dev) error = ENXIO; } else device_set_desc(dev, psc->sc_version); - bus_release_resource(dev, SYS_RES_IOPORT, psc->sc_port_rid, - psc->sc_port_res); - psc->sc_port_res = 0; - - return error; -} - -static int -awi_pccard_attach(device_t dev) -{ - struct awi_pccard_softc *psc = device_get_softc(dev); - struct awi_softc *sc = &psc->sc_awi; - int error = 0; - psc->sc_port_res = 0; psc->sc_irq_res = 0; psc->sc_mem_res = 0; psc->sc_intrhand = 0; @@ -277,16 +262,11 @@ awi_pccard_disable(struct awi_softc *sc) static device_method_t awi_pccard_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, pccard_compat_probe), - DEVMETHOD(device_attach, pccard_compat_attach), + DEVMETHOD(device_probe, awi_pccard_probe), + DEVMETHOD(device_attach, awi_pccard_attach), DEVMETHOD(device_detach, awi_pccard_detach), DEVMETHOD(device_shutdown, awi_pccard_shutdown), - /* Card interface */ - DEVMETHOD(card_compat_match, awi_pccard_match), - DEVMETHOD(card_compat_probe, awi_pccard_probe), - DEVMETHOD(card_compat_attach, awi_pccard_attach), - { 0, 0 } }; |