From 8dace48f6b4f896c7aece67fe5a737082969bab5 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Thu, 14 Apr 2011 17:31:34 +0000 Subject: [PATCH] iwn_cleanup() is just a wrapper around iwn_detach(), call it directly instead. --- sys/dev/iwn/if_iwn.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c index 32e250b51a4..fb965c39e1a 100644 --- a/sys/dev/iwn/if_iwn.c +++ b/sys/dev/iwn/if_iwn.c @@ -81,7 +81,6 @@ static struct ieee80211vap *iwn_vap_create(struct ieee80211com *, int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]); static void iwn_vap_delete(struct ieee80211vap *); -static int iwn_cleanup(device_t); static int iwn_detach(device_t); static int iwn_nic_lock(struct iwn_softc *); static int iwn_eeprom_lock(struct iwn_softc *); @@ -684,7 +683,7 @@ iwn_attach(device_t dev) ieee80211_announce(ic); return 0; fail: - iwn_cleanup(dev); + iwn_detach(dev); return error; } @@ -845,7 +844,7 @@ iwn_vap_delete(struct ieee80211vap *vap) } static int -iwn_cleanup(device_t dev) +iwn_detach(device_t dev) { struct iwn_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; @@ -894,13 +893,6 @@ iwn_cleanup(device_t dev) return 0; } -static int -iwn_detach(device_t dev) -{ - iwn_cleanup(dev); - return 0; -} - static int iwn_nic_lock(struct iwn_softc *sc) {