From owner-svn-src-all@FreeBSD.ORG Mon Mar 9 23:04:06 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65CD31065676; Mon, 9 Mar 2009 23:04:06 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 53C9F8FC1E; Mon, 9 Mar 2009 23:04:06 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n29N46kS039861; Mon, 9 Mar 2009 23:04:06 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n29N469r039860; Mon, 9 Mar 2009 23:04:06 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200903092304.n29N469r039860@svn.freebsd.org> From: Sam Leffler Date: Mon, 9 Mar 2009 23:04:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189604 - head/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 23:04:07 -0000 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