diff options
author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-10-23 18:19:27 +0000 |
---|---|---|
committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-10-23 18:19:27 +0000 |
commit | 749f214f42255b2e9cb5530a47a37d419b02e670 (patch) | |
tree | 7ab5a6ff636f938cc05f9b877fb66cfd0f91a5cc /sys/dev/pci/if_iwi.c | |
parent | 172e852c3ebb0b306c0a9ecdf5d94443e6e8fd02 (diff) |
remove detach() function. this is not hotplug and this is dead code.
Diffstat (limited to 'sys/dev/pci/if_iwi.c')
-rw-r--r-- | sys/dev/pci/if_iwi.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index a80a74d9bfd..3b7c0498a12 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.76 2006/10/22 08:25:43 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.77 2006/10/23 18:19:26 damien Exp $ */ /*- * Copyright (c) 2004-2006 @@ -94,7 +94,6 @@ static const struct ieee80211_rateset iwi_rateset_11g = int iwi_match(struct device *, void *, void *); void iwi_attach(struct device *, struct device *, void *); -int iwi_detach(struct device *, int); void iwi_power(int, void *); int iwi_alloc_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *); void iwi_reset_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *); @@ -160,7 +159,7 @@ int iwi_debug = 0; #endif struct cfattach iwi_ca = { - sizeof (struct iwi_softc), iwi_match, iwi_attach, iwi_detach + sizeof (struct iwi_softc), iwi_match, iwi_attach }; int @@ -373,33 +372,6 @@ fail2: iwi_free_tx_ring(sc, &sc->txq[0]); fail1: iwi_free_cmd_ring(sc, &sc->cmdq); } -int -iwi_detach(struct device *self, int flags) -{ - struct iwi_softc *sc = (struct iwi_softc *)self; - struct ifnet *ifp = &sc->sc_ic.ic_if; - int i; - - iwi_stop(ifp, 1); - - ieee80211_ifdetach(ifp); - if_detach(ifp); - - iwi_free_cmd_ring(sc, &sc->cmdq); - for (i = 0; i < 4; i++) - iwi_free_tx_ring(sc, &sc->txq[i]); - iwi_free_rx_ring(sc, &sc->rxq); - - if (sc->sc_ih != NULL) { - pci_intr_disestablish(sc->sc_pct, sc->sc_ih); - sc->sc_ih = NULL; - } - - bus_space_unmap(sc->sc_st, sc->sc_sh, sc->sc_sz); - - return 0; -} - void iwi_power(int why, void *arg) { |