---

yaml
---
r: 220255
b: refs/heads/master
c: 0d2f072
h: refs/heads/master
i:
  220253: 455452a
  220251: f812a7e
  220247: 69f6e82
  220239: d186c34
  220223: e2eacef
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17c4da1ecfc18ac07c14a7060b1a3841e385ad5a
+refs/heads/master: 0d2f0724a4b3a5d1631c39b1bbe7c78c4a15a7ac

trunk/drivers/staging/brcm80211/include/bcmdefs.h

@@ -33,13 +33,7 @@
 /* Reclaiming text and data :
  * The following macros specify special linker sections that can be reclaimed
  * after a system is considered 'up'.
- * BCMATTACHFN is also used for detach functions (it's not worth having a BCMDETACHFN,
- * as in most cases, the attach function calls the detach function to clean up on error).
  */
-
-#define bcmreclaimed 		0
-#define BCMATTACHDATA(_data)	_data
-#define BCMATTACHFN(_fn)	_fn
 #define BCMINITDATA(_data)	_data
 #define BCMINITFN(_fn)		_fn
 #define BCMUNINITFN(_fn)	_fn

trunk/drivers/staging/brcm80211/phy/wlc_phy_cmn.c

@@ -551,7 +551,7 @@ static void WLBANDINITFN(wlc_set_phy_uninitted) (phy_info_t *pi)
 	}
 }
 
-shared_phy_t *BCMATTACHFN(wlc_phy_shared_attach) (shared_phy_params_t *shp)
+shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp)
 {
 	shared_phy_t *sh;
 
@@ -590,7 +590,7 @@ shared_phy_t *BCMATTACHFN(wlc_phy_shared_attach) (shared_phy_params_t *shp)
 	return sh;
 }
 
-void BCMATTACHFN(wlc_phy_shared_detach) (shared_phy_t *phy_sh)
+void wlc_phy_shared_detach(shared_phy_t *phy_sh)
 {
 	osl_t *osh;
 
@@ -604,8 +604,8 @@ void BCMATTACHFN(wlc_phy_shared_detach) (shared_phy_t *phy_sh)
 	}
 }
 
-wlc_phy_t *BCMATTACHFN(wlc_phy_attach) (shared_phy_t *sh, void *regs,
-					int bandtype, char *vars) {
+wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, char *vars)
+{
 	phy_info_t *pi;
 	u32 sflags = 0;
 	uint phyversion;
@@ -786,7 +786,7 @@ wlc_phy_t *BCMATTACHFN(wlc_phy_attach) (shared_phy_t *sh, void *regs,
 	return NULL;
 }
 
-void BCMATTACHFN(wlc_phy_detach) (wlc_phy_t *pih)
+void wlc_phy_detach(wlc_phy_t *pih)
 {
 	phy_info_t *pi = (phy_info_t *) pih;
 

trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c

@@ -4726,7 +4726,7 @@ static void wlc_lcnphy_rc_cal(phy_info_t *pi)
 	return;
 }
 
-static bool BCMATTACHFN(wlc_phy_txpwr_srom_read_lcnphy) (phy_info_t *pi)
+static bool wlc_phy_txpwr_srom_read_lcnphy(phy_info_t *pi)
 {
 	s8 txpwr = 0;
 	int i;

trunk/drivers/staging/brcm80211/phy/wlc_phy_n.c

@@ -14505,7 +14505,7 @@ bool wlc_phy_attach_nphy(phy_info_t *pi)
 	return TRUE;
 }
 
-static void BCMATTACHFN(wlc_phy_txpwrctrl_config_nphy) (phy_info_t *pi)
+static void wlc_phy_txpwrctrl_config_nphy(phy_info_t *pi)
 {
 
 	if (NREV_GE(pi->pubpi.phy_rev, 3)) {
@@ -27940,7 +27940,7 @@ void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
 	return;
 }
 
-static void BCMATTACHFN(wlc_phy_txpwr_srom_read_ppr_nphy) (phy_info_t *pi)
+static void wlc_phy_txpwr_srom_read_ppr_nphy(phy_info_t *pi)
 {
 	u16 bw40po, cddpo, stbcpo, bwduppo;
 	uint band_num;
@@ -28148,7 +28148,7 @@ static void BCMATTACHFN(wlc_phy_txpwr_srom_read_ppr_nphy) (phy_info_t *pi)
 	wlc_phy_txpwr_apply_nphy(pi);
 }
 
-static bool BCMATTACHFN(wlc_phy_txpwr_srom_read_nphy) (phy_info_t *pi)
+static bool wlc_phy_txpwr_srom_read_nphy(phy_info_t *pi)
 {
 
 	pi->antswitch = (u8) PHY_GETINTVAR(pi, "antswitch");

trunk/drivers/staging/brcm80211/sys/wlc_alloc.c

@@ -46,7 +46,7 @@ void *wlc_calloc(osl_t *osh, uint unit, uint size)
 	return item;
 }
 
-void BCMATTACHFN(wlc_tunables_init) (wlc_tunables_t *tunables, uint devid)
+void wlc_tunables_init(wlc_tunables_t *tunables, uint devid)
 {
 	tunables->ntxd = NTXD;
 	tunables->nrxd = NRXD;
@@ -69,8 +69,8 @@ void BCMATTACHFN(wlc_tunables_init) (wlc_tunables_t *tunables, uint devid)
 #endif				/* WLC_HIGH_ONLY */
 }
 
-static wlc_pub_t *BCMATTACHFN(wlc_pub_malloc) (osl_t *osh, uint unit,
-					       uint *err, uint devid) {
+static wlc_pub_t *wlc_pub_malloc(osl_t *osh, uint unit, uint *err, uint devid)
+{
 	wlc_pub_t *pub;
 
 	pub = (wlc_pub_t *) wlc_calloc(osh, unit, sizeof(wlc_pub_t));
@@ -103,7 +103,7 @@ static wlc_pub_t *BCMATTACHFN(wlc_pub_malloc) (osl_t *osh, uint unit,
 	return NULL;
 }
 
-static void BCMATTACHFN(wlc_pub_mfree) (osl_t *osh, wlc_pub_t *pub)
+static void wlc_pub_mfree(osl_t *osh, wlc_pub_t *pub)
 {
 	if (pub == NULL)
 		return;
@@ -173,8 +173,8 @@ void wlc_bsscfg_ID_assign(wlc_info_t *wlc, wlc_bsscfg_t *bsscfg)
 /*
  * The common driver entry routine. Error codes should be unique
  */
-wlc_info_t *BCMATTACHFN(wlc_attach_malloc) (osl_t *osh, uint unit, uint *err,
-					    uint devid) {
+wlc_info_t *wlc_attach_malloc(osl_t *osh, uint unit, uint *err, uint devid)
+{
 	wlc_info_t *wlc;
 
 	wlc = (wlc_info_t *) wlc_calloc(osh, unit, sizeof(wlc_info_t));
@@ -310,7 +310,7 @@ wlc_info_t *BCMATTACHFN(wlc_attach_malloc) (osl_t *osh, uint unit, uint *err,
 	return NULL;
 }
 
-void BCMATTACHFN(wlc_detach_mfree) (wlc_info_t *wlc, osl_t *osh)
+void wlc_detach_mfree(wlc_info_t *wlc, osl_t *osh)
 {
 	if (wlc == NULL)
 		return;

trunk/drivers/staging/brcm80211/sys/wlc_ampdu.c

@@ -167,7 +167,7 @@ static inline u16 pkt_txh_seqnum(wlc_info_t *wlc, void *p)
 	return ltoh16(h->seq) >> SEQNUM_SHIFT;
 }
 
-ampdu_info_t *BCMATTACHFN(wlc_ampdu_attach) (wlc_info_t *wlc)
+ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc)
 {
 	ampdu_info_t *ampdu;
 	int i;
@@ -233,7 +233,7 @@ ampdu_info_t *BCMATTACHFN(wlc_ampdu_attach) (wlc_info_t *wlc)
 	return ampdu;
 }
 
-void BCMATTACHFN(wlc_ampdu_detach) (ampdu_info_t *ampdu)
+void wlc_ampdu_detach(ampdu_info_t *ampdu)
 {
 	int i;
 

trunk/drivers/staging/brcm80211/sys/wlc_antsel.c

@@ -155,7 +155,7 @@ antsel_info_t *BCMNMIATTACHFN(wlc_antsel_attach) (wlc_info_t *wlc, osl_t *osh,
 	return asi;
 }
 
-void BCMATTACHFN(wlc_antsel_detach) (antsel_info_t *asi)
+void wlc_antsel_detach(antsel_info_t *asi)
 {
 	if (!asi)
 		return;

trunk/drivers/staging/brcm80211/sys/wlc_bmac.c

@@ -566,8 +566,7 @@ int wlc_bmac_state_get(wlc_hw_info_t *wlc_hw, wlc_bmac_state_t *state)
 	return 0;
 }
 
-static bool
-BCMATTACHFN(wlc_bmac_attach_dmapio) (wlc_info_t *wlc, uint j, bool wme)
+static bool wlc_bmac_attach_dmapio(wlc_info_t *wlc, uint j, bool wme)
 {
 	uint i;
 	char name[8];
@@ -686,7 +685,7 @@ BCMATTACHFN(wlc_bmac_attach_dmapio) (wlc_info_t *wlc, uint j, bool wme)
 	return TRUE;
 }
 
-static void BCMATTACHFN(wlc_bmac_detach_dmapio) (wlc_hw_info_t *wlc_hw)
+static void wlc_bmac_detach_dmapio(wlc_hw_info_t *wlc_hw)
 {
 	uint j;
 
@@ -704,11 +703,10 @@ static void BCMATTACHFN(wlc_bmac_detach_dmapio) (wlc_hw_info_t *wlc_hw)
  *    initialize software state for each core and band
  *    put the whole chip in reset(driver down state), no clock
  */
-
-int
-BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, u16 vendor, u16 device,
-			      uint unit, bool piomode, osl_t *osh,
-			      void *regsva, uint bustype, void *btparam) {
+int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
+		    bool piomode, osl_t *osh, void *regsva, uint bustype,
+		    void *btparam)
+{
 	wlc_hw_info_t *wlc_hw;
 	d11regs_t *regs;
 	char *macaddr = NULL;
@@ -1048,7 +1046,7 @@ BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, u16 vendor, u16 device,
  * may get overrides later in this function
  *  BMAC_NOTES, move low out and resolve the dangling ones
  */
-void BCMATTACHFN(wlc_bmac_info_init) (wlc_hw_info_t *wlc_hw)
+void wlc_bmac_info_init(wlc_hw_info_t *wlc_hw)
 {
 	wlc_info_t *wlc = wlc_hw->wlc;
 
@@ -1070,7 +1068,7 @@ void BCMATTACHFN(wlc_bmac_info_init) (wlc_hw_info_t *wlc_hw)
 /*
  * low level detach
  */
-int BCMATTACHFN(wlc_bmac_detach) (wlc_info_t *wlc)
+int wlc_bmac_detach(wlc_info_t *wlc)
 {
 	uint i;
 	wlc_hwband_t *band;
@@ -2142,7 +2140,7 @@ void WLBANDINITFN(wlc_setxband) (wlc_hw_info_t *wlc_hw, uint bandunit)
 	}
 }
 
-static bool BCMATTACHFN(wlc_isgoodchip) (wlc_hw_info_t *wlc_hw)
+static bool wlc_isgoodchip(wlc_hw_info_t *wlc_hw)
 {
 
 	/* reject unsupported corerev */
@@ -2154,7 +2152,7 @@ static bool BCMATTACHFN(wlc_isgoodchip) (wlc_hw_info_t *wlc_hw)
 	return TRUE;
 }
 
-static bool BCMATTACHFN(wlc_validboardtype) (wlc_hw_info_t *wlc_hw)
+static bool wlc_validboardtype(wlc_hw_info_t *wlc_hw)
 {
 	bool goodboard = TRUE;
 	uint boardrev = wlc_hw->boardrev;
@@ -2784,7 +2782,7 @@ static void BCMINITFN(wlc_gpio_init) (wlc_info_t *wlc)
 	si_gpiocontrol(wlc_hw->sih, gm, gc, GPIO_DRV_PRIORITY);
 }
 
-static void BCMATTACHFN(wlc_ucode_download) (wlc_hw_info_t *wlc_hw)
+static void wlc_ucode_download(wlc_hw_info_t *wlc_hw)
 {
 	wlc_info_t *wlc;
 	wlc = wlc_hw->wlc;
@@ -2812,8 +2810,7 @@ static void BCMATTACHFN(wlc_ucode_download) (wlc_hw_info_t *wlc_hw)
 	}
 }
 
-static void
-BCMATTACHFN(wlc_ucode_write) (wlc_hw_info_t *wlc_hw, const u32 ucode[],
+static void wlc_ucode_write(wlc_hw_info_t *wlc_hw, const u32 ucode[],
 			      const uint nbytes) {
 	osl_t *osh;
 	d11regs_t *regs = wlc_hw->regs;
@@ -3668,7 +3665,7 @@ wlc_bmac_read_tsf(wlc_hw_info_t *wlc_hw, u32 *tsf_l_ptr,
 	return;
 }
 
-bool BCMATTACHFN(wlc_bmac_validate_chip_access) (wlc_hw_info_t *wlc_hw)
+bool wlc_bmac_validate_chip_access(wlc_hw_info_t *wlc_hw)
 {
 	d11regs_t *regs;
 	u32 w, val;

trunk/drivers/staging/brcm80211/sys/wlc_channel.c

@@ -602,7 +602,7 @@ const locale_mimo_info_t *wlc_get_mimo_5g(u8 locale_idx)
 	return g_mimo_5g_table[locale_idx];
 }
 
-wlc_cm_info_t *BCMATTACHFN(wlc_channel_mgr_attach) (wlc_info_t *wlc)
+wlc_cm_info_t *wlc_channel_mgr_attach(wlc_info_t *wlc)
 {
 	wlc_cm_info_t *wlc_cm;
 	char country_abbrev[WLC_CNTRY_BUF_SZ];
@@ -649,7 +649,7 @@ wlc_cm_info_t *BCMATTACHFN(wlc_channel_mgr_attach) (wlc_info_t *wlc)
 	return wlc_cm;
 }
 
-void BCMATTACHFN(wlc_channel_mgr_detach) (wlc_cm_info_t *wlc_cm)
+void wlc_channel_mgr_detach(wlc_cm_info_t *wlc_cm)
 {
 	if (wlc_cm)
 		MFREE(wlc_cm->pub->osh, wlc_cm, sizeof(wlc_cm_info_t));

trunk/drivers/staging/brcm80211/sys/wlc_event.c

@@ -53,9 +53,9 @@ struct wlc_eventq {
 /*
  * Export functions
  */
-wlc_eventq_t *BCMATTACHFN(wlc_eventq_attach) (wlc_pub_t *pub,
-					      struct wlc_info *wlc, void *wl,
-					      wlc_eventq_cb_t cb) {
+wlc_eventq_t *wlc_eventq_attach(wlc_pub_t *pub, struct wlc_info *wlc, void *wl,
+				wlc_eventq_cb_t cb)
+{
 	wlc_eventq_t *eq;
 
 	eq = (wlc_eventq_t *) MALLOC(pub->osh, sizeof(wlc_eventq_t));
@@ -80,7 +80,7 @@ wlc_eventq_t *BCMATTACHFN(wlc_eventq_attach) (wlc_pub_t *pub,
 	return eq;
 }
 
-int BCMATTACHFN(wlc_eventq_detach) (wlc_eventq_t *eq)
+int wlc_eventq_detach(wlc_eventq_t *eq)
 {
 	/* Clean up pending events */
 	wlc_eventq_down(eq);