staging: brcm80211: remove BCMNMIATTACHFN() macro.

Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Oct 12, 2010 · a9d0fff · a9d0fff
1 parent 9927fc2
commit a9d0fff
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h
@@ -29,12 +29,6 @@
  * typedefs.h is included.
  */
 
-
-/* Reclaiming text and data :
- * The following macros specify special linker sections that can be reclaimed
- * after a system is considered 'up'.
- */
-#define	BCMNMIATTACHFN(_fn)	_fn
 #ifdef mips
 #define BCMFASTPATH		__attribute__ ((__section__(".text.fastpath")))
 #else

diff --git a/drivers/staging/brcm80211/phy/wlc_phy_n.c b/drivers/staging/brcm80211/phy/wlc_phy_n.c
@@ -27742,7 +27742,7 @@ wlc_phy_mcs_to_ofdm_powers_nphy(u8 *power, u8 rate_ofdm_start,
 	}
 }
 
-void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
+void wlc_phy_txpwr_apply_nphy(phy_info_t *pi)
 {
 	uint rate1, rate2, band_num;
 	u8 tmp_bw40po = 0, tmp_cddpo = 0, tmp_stbcpo = 0;

diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c
@@ -89,7 +89,7 @@ const u8 mimo_2x3_div_antselid_tbl[16] = {
 	0, 0, 0, 0, 0, 0, 0, 0	/* pat to antselid */
 };
 
-antsel_info_t *BCMNMIATTACHFN(wlc_antsel_attach) (wlc_info_t *wlc, osl_t *osh,
+antsel_info_t *wlc_antsel_attach(wlc_info_t *wlc, osl_t *osh,
 						  wlc_pub_t *pub,
 						  wlc_hw_info_t *wlc_hw) {
 	antsel_info_t *asi;

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -2065,7 +2065,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
 	return NULL;
 }
 
-static void BCMNMIATTACHFN(wlc_attach_antgain_init) (wlc_info_t *wlc)
+static void wlc_attach_antgain_init(wlc_info_t *wlc)
 {
 	uint unit;
 	unit = wlc->pub->unit;

diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
@@ -237,7 +237,7 @@ static int ipxotp_max_rgnsz(si_t *sih, int osizew)
 	return ret;
 }
 
-static void BCMNMIATTACHFN(_ipxotp_init) (otpinfo_t *oi, chipcregs_t *cc)
+static void _ipxotp_init(otpinfo_t *oi, chipcregs_t *cc)
 {
 	uint k;
 	u32 otpp, st;
@@ -308,7 +308,7 @@ static void BCMNMIATTACHFN(_ipxotp_init) (otpinfo_t *oi, chipcregs_t *cc)
 	oi->flim = oi->wsize;
 }
 
-static void *BCMNMIATTACHFN(ipxotp_init) (si_t *sih)
+static void *ipxotp_init(si_t *sih)
 {
 	uint idx;
 	chipcregs_t *cc;
@@ -630,7 +630,7 @@ static u16 hndotp_read_bit(void *oh, chipcregs_t *cc, uint idx)
 	return (u16) st;
 }
 
-static void *BCMNMIATTACHFN(hndotp_init) (si_t *sih)
+static void *hndotp_init(si_t *sih)
 {
 	uint idx;
 	chipcregs_t *cc;
@@ -895,7 +895,7 @@ u16 otp_read_bit(void *oh, uint offset)
 	return readBit;
 }
 
-void *BCMNMIATTACHFN(otp_init) (si_t *sih)
+void *otp_init(si_t *sih)
 {
 	otpinfo_t *oi;
 	void *ret = NULL;
@@ -928,7 +928,7 @@ void *BCMNMIATTACHFN(otp_init) (si_t *sih)
 }
 
 int
-BCMNMIATTACHFN(otp_read_region) (si_t *sih, int region, u16 *data,
+otp_read_region(si_t *sih, int region, u16 *data,
 				 uint *wlen) {
 	bool wasup = FALSE;
 	void *oh;