svn commit: r220635 - head/sys/dev/iwn

[Bernhard Schmidt]

Author: bschmidt
Date: Thu Apr 14 17:31:34 2011
New Revision: 220635
URL: http://svn.freebsd.org/changeset/base/220635

Log:
  iwn_cleanup() is just a wrapper around iwn_detach(), call it directly
  instead.

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Thu Apr 14 17:26:13 2011	(r220634)
+++ head/sys/dev/iwn/if_iwn.c	Thu Apr 14 17:31:34 2011	(r220635)
@@ -81,7 +81,6 @@ static struct ieee80211vap *iwn_vap_crea
 		    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;
@@ -895,13 +894,6 @@ iwn_cleanup(device_t dev)
 }
 
 static int
-iwn_detach(device_t dev)
-{
-	iwn_cleanup(dev);
-	return 0;
-}
-
-static int
 iwn_nic_lock(struct iwn_softc *sc)
 {
 	int ntries;