From 7a5b855af3ff12c746e3d26fd70ec334c71d0214 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 20 Sep 2005 19:49:33 +0000 Subject: [PATCH] Remove oldcard support by removing the compat shims. --- sys/dev/cs/if_cs_pccard.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c index 6935bf49dc0..794f48dc8bc 100644 --- a/sys/dev/cs/if_cs_pccard.c +++ b/sys/dev/cs/if_cs_pccard.c @@ -55,7 +55,7 @@ static const struct pccard_product cs_pccard_products[] = { { NULL } }; static int -cs_pccard_match(device_t dev) +cs_pccard_probe(device_t dev) { const struct pccard_product *pp; int error; @@ -78,26 +78,15 @@ cs_pccard_match(device_t dev) } static int -cs_pccard_probe(device_t dev) +cs_pccard_attach(device_t dev) { struct cs_softc *sc = device_get_softc(dev); int error; sc->flags |= CS_NO_IRQ; error = cs_cs89x0_probe(dev); - cs_release_resources(dev); - return (error); -} - -static int -cs_pccard_attach(device_t dev) -{ - struct cs_softc *sc = device_get_softc(dev); - int error; - - error = cs_alloc_port(dev, sc->port_rid, CS_89x0_IO_PORTS); if (error != 0) - goto bad; + return (error); error = cs_alloc_irq(dev, sc->irq_rid, 0); if (error != 0) goto bad; @@ -114,15 +103,10 @@ bad: static device_method_t cs_pccard_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, pccard_compat_probe), - DEVMETHOD(device_attach, pccard_compat_attach), + DEVMETHOD(device_probe, cs_pccard_probe), + DEVMETHOD(device_attach, cs_pccard_attach), DEVMETHOD(device_detach, cs_detach), - /* Card interface */ - DEVMETHOD(card_compat_match, cs_pccard_match), - DEVMETHOD(card_compat_probe, cs_pccard_probe), - DEVMETHOD(card_compat_attach, cs_pccard_attach), - { 0, 0 } };