From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 11 Oct 2010 14:02:59 +0000 (-0400)
Subject: staging: brcm80211: remove BCMUNINITFN() macro.
X-Git-Tag: v2.6.37-rc1~60^2~3^2~160
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=9927fc2eab153cf3c39d505733b1d534d818c2bb;p=karo-tx-linux.git

staging: brcm80211: remove BCMUNINITFN() macro.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h
index 2e39d0d2e24e..232a77b23170 100644
--- a/drivers/staging/brcm80211/include/bcmdefs.h
+++ b/drivers/staging/brcm80211/include/bcmdefs.h
@@ -34,7 +34,6 @@
  * The following macros specify special linker sections that can be reclaimed
  * after a system is considered 'up'.
  */
-#define BCMUNINITFN(_fn)	_fn
 #define	BCMNMIATTACHFN(_fn)	_fn
 #ifdef mips
 #define BCMFASTPATH		__attribute__ ((__section__(".text.fastpath")))
diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
index af75194a7491..89880c1300a4 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
@@ -1047,7 +1047,7 @@ void wlc_phy_cal_init(wlc_phy_t *pih)
 	}
 }
 
-int BCMUNINITFN(wlc_phy_down) (wlc_phy_t *pih)
+int wlc_phy_down(wlc_phy_t *pih)
 {
 	phy_info_t *pi = (phy_info_t *) pih;
 	int callbacks = 0;
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index 345fa5aa1eaf..360a9e6b54d4 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -1249,7 +1249,7 @@ int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw)
 	return 0;
 }
 
-int BCMUNINITFN(wlc_bmac_down_prep) (wlc_hw_info_t *wlc_hw)
+int wlc_bmac_down_prep(wlc_hw_info_t *wlc_hw)
 {
 	bool dev_gone;
 	uint callbacks = 0;
@@ -1277,7 +1277,7 @@ int BCMUNINITFN(wlc_bmac_down_prep) (wlc_hw_info_t *wlc_hw)
 	return callbacks;
 }
 
-int BCMUNINITFN(wlc_bmac_down_finish) (wlc_hw_info_t *wlc_hw)
+int wlc_bmac_down_finish(wlc_hw_info_t *wlc_hw)
 {
 	uint callbacks = 0;
 	bool dev_gone;
diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c
index 0041fd3f55ca..9d887f46a9c0 100644
--- a/drivers/staging/brcm80211/sys/wlc_event.c
+++ b/drivers/staging/brcm80211/sys/wlc_event.c
@@ -99,7 +99,7 @@ int wlc_eventq_detach(wlc_eventq_t *eq)
 	return 0;
 }
 
-int BCMUNINITFN(wlc_eventq_down) (wlc_eventq_t *eq)
+int wlc_eventq_down(wlc_eventq_t *eq)
 {
 	int callbacks = 0;
 	if (eq->tpending && !eq->workpending) {
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 9b134ad35896..6297ceb0a56d 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -2846,7 +2846,7 @@ static void wlc_tx_prec_map_init(wlc_info_t *wlc)
 	}
 }
 
-static uint BCMUNINITFN(wlc_down_del_timer) (wlc_info_t *wlc)
+static uint wlc_down_del_timer(wlc_info_t *wlc)
 {
 	uint callbacks = 0;
 
@@ -2858,7 +2858,7 @@ static uint BCMUNINITFN(wlc_down_del_timer) (wlc_info_t *wlc)
  * disable the hardware, free any transient buffer state.
  * Return a count of the number of driver callbacks still pending.
  */
-uint BCMUNINITFN(wlc_down) (wlc_info_t *wlc)
+uint wlc_down(wlc_info_t *wlc)
 {
 
 	uint callbacks = 0;
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index d23d35e7a88b..0127dedd094d 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@ -106,7 +106,7 @@ int nvram_append(void *si, char *varlst, uint varsz)
 	return BCME_OK;
 }
 
-void BCMUNINITFN(nvram_exit) (void *si)
+void nvram_exit(void *si)
 {
 	vars_t *this, *next;
 	si_t *sih;
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index ff62b647d270..42874e944faf 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -1631,7 +1631,7 @@ void si_pci_up(si_t *sih)
 }
 
 /* Unconfigure and/or apply various WARs when system is going to sleep mode */
-void BCMUNINITFN(si_pci_sleep) (si_t *sih)
+void si_pci_sleep(si_t *sih)
 {
 	si_info_t *sii;