Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jan 2013 07:41:50 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r245449 - stable/9/sys/dev/ath/ath_hal/ar9002
Message-ID:  <201301150741.r0F7fo86031687@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Tue Jan 15 07:41:50 2013
New Revision: 245449
URL: http://svnweb.freebsd.org/changeset/base/245449

Log:
  Revert the MFC to sys/dev/ath/ath_hal/ar9002/ar9285_attach.c again,
  since it does not compile on stable/9.  During testing, I had a
  different local fix, so I failed to notice this did not work.  Apologies
  for the breakage.
  
  Pointy hat to:	dim

Modified:
  stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
==============================================================================
--- stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Tue Jan 15 07:07:29 2013	(r245448)
+++ stable/9/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c	Tue Jan 15 07:41:50 2013	(r245449)
@@ -134,18 +134,6 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s
 
 	ar5416InitState(AH5416(ah), devid, sc, st, sh, status);
 
-	/*
-	 * Use the "local" EEPROM data given to us by the higher layers.
-	 * This is a private copy out of system flash. The Linux ath9k
-	 * commit for the initial AR9130 support mentions MMIO flash
-	 * access is "unreliable." -adrian
-	 */
-	if (eepromdata != AH_NULL) {
-		AH_PRIVATE(ah)->ah_eepromRead = ath_hal_EepromDataRead;
-		AH_PRIVATE(ah)->ah_eepromWrite = NULL;
-		ah->ah_eepromdata = eepromdata;
-	}
-
 	/* XXX override with 9285 specific state */
 	/* override 5416 methods for our needs */
 	AH5416(ah)->ah_initPLL = ar9280InitPLL;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301150741.r0F7fo86031687>