diff options
| author | mdodd <mdodd@FreeBSD.org> | 2003-03-29 22:27:41 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 2003-03-29 22:27:41 +0000 |
| commit | 446c24ca7a6af68dfed415abc309c05b74ba2e28 (patch) | |
| tree | be62e62d30921bff99da6055e80e0cf3a53f379b /sys/dev/ep/if_ep_pccard.c | |
| parent | cdc67e7072fb97bd41f4db2549ff13b3366ae34d (diff) | |
| download | FreeBSD-src-446c24ca7a6af68dfed415abc309c05b74ba2e28.zip FreeBSD-src-446c24ca7a6af68dfed415abc309c05b74ba2e28.tar.gz | |
- Free interrupt handler in ep_free().
- Move ep_pccard_detach() to if_ep.c and rename to ep_detach()
- Specify detach methods for all bus frontends.
Diffstat (limited to 'sys/dev/ep/if_ep_pccard.c')
| -rw-r--r-- | sys/dev/ep/if_ep_pccard.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c index a4be882..ca30515 100644 --- a/sys/dev/ep/if_ep_pccard.c +++ b/sys/dev/ep/if_ep_pccard.c @@ -236,23 +236,6 @@ bad: return (error); } -static int -ep_pccard_detach(device_t dev) -{ - struct ep_softc *sc = device_get_softc(dev); - - if (sc->gone) { - device_printf(dev, "already unloaded\n"); - return (0); - } - sc->arpcom.ac_if.if_flags &= ~IFF_RUNNING; - ether_ifdetach(&sc->arpcom.ac_if); - sc->gone = 1; - bus_teardown_intr(dev, sc->irq, sc->ep_intrhand); - ep_free(dev); - return (0); -} - static const struct pccard_product ep_pccard_products[] = { PCMCIA_CARD(3COM, 3C1, 0), PCMCIA_CARD(3COM, 3C562, 0), @@ -281,7 +264,7 @@ static device_method_t ep_pccard_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pccard_compat_probe), DEVMETHOD(device_attach, pccard_compat_attach), - DEVMETHOD(device_detach, ep_pccard_detach), + DEVMETHOD(device_detach, ep_detach), /* Card interface */ DEVMETHOD(card_compat_match, ep_pccard_match), |
