svn commit: r189604 - head/sys/dev/ath/ath_hal/ar5416

Sam Leffler sam at FreeBSD.org
Mon Mar 9 16:04:07 PDT 2009


Author: sam
Date: Mon Mar  9 23:04:06 2009
New Revision: 189604
URL: http://svn.freebsd.org/changeset/base/189604

Log:
  remove ar9160Detach; it does nothing

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c	Mon Mar  9 22:54:17 2009	(r189603)
+++ head/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c	Mon Mar  9 23:04:06 2009	(r189604)
@@ -57,7 +57,6 @@ static const HAL_PERCAL_DATA ar9160_adc_
 	.calPostProc	= ar5416AdcDcCalibration
 };
 
-static void ar9160Detach(struct ath_hal *);
 static HAL_BOOL ar9160FillCapabilityInfo(struct ath_hal *ah);
 
 static void
@@ -116,7 +115,6 @@ ar9160Attach(uint16_t devid, HAL_SOFTC s
 
 	/* XXX override with 9160 specific state */
 	/* override 5416 methods for our needs */
-	ah->ah_detach			= ar9160Detach;
 
 	AH5416(ah)->ah_cal.iqCalData.calData = &ar9160_iq_cal;
 	AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9160_adc_gain_cal;
@@ -258,23 +256,12 @@ ar9160Attach(uint16_t devid, HAL_SOFTC s
 	return ah;
 bad:
 	if (ahp)
-		ar9160Detach((struct ath_hal *) ahp);
+		ar5416Detach((struct ath_hal *) ahp);
 	if (status)
 		*status = ecode;
 	return AH_NULL;
 }
 
-void
-ar9160Detach(struct ath_hal *ah)
-{
-	HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s:\n", __func__);
-
-	HALASSERT(ah != AH_NULL);
-	HALASSERT(ah->ah_magic == AR5416_MAGIC);
-
-	ar5416Detach(ah);
-}
-
 /*
  * Fill all software cached or static hardware state information.
  * Return failure if capabilities are to come from EEPROM and


More information about the svn-src-all mailing list