--- src/sys/dev/netif/an/if_an_isa.c 2005/06/15 11:35:22 1.10 +++ src/sys/dev/netif/an/if_an_isa.c 2005/07/27 21:56:32 1.11 @@ -79,7 +79,6 @@ static struct isa_pnp_id an_ids[] = { static int an_probe_isa (device_t); static int an_attach_isa (device_t); -static int an_detach_isa (device_t); static int an_probe_isa(dev) @@ -136,26 +135,11 @@ fail: return(error); } -static int -an_detach_isa(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - struct ifnet *ifp = &sc->arpcom.ac_if; - - an_stop(sc); - ifmedia_removeall(&sc->an_ifmedia); - ether_ifdetach(ifp); - bus_teardown_intr(dev, sc->irq_res, sc->irq_handle); - an_release_resources(dev); - - return (0); -} - static device_method_t an_isa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, an_probe_isa), DEVMETHOD(device_attach, an_attach_isa), - DEVMETHOD(device_detach, an_detach_isa), + DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), { 0, 0 } };