staging: brcm80211: remove BCMUNINITFN() macro.
authorJason Cooper <jason@lakedaemon.net>
Mon, 11 Oct 2010 14:02:59 +0000 (10:02 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 12 Oct 2010 15:52:28 +0000 (08:52 -0700)
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/include/bcmdefs.h
drivers/staging/brcm80211/phy/wlc_phy_cmn.c
drivers/staging/brcm80211/sys/wlc_bmac.c
drivers/staging/brcm80211/sys/wlc_event.c
drivers/staging/brcm80211/sys/wlc_mac80211.c
drivers/staging/brcm80211/util/nvram/nvram_ro.c
drivers/staging/brcm80211/util/siutils.c

index 2e39d0d2e24eb47b84fca8312789add9af6d1f85..232a77b23170bf4bc834bca24ad1f8ab6e87e9c4 100644 (file)
@@ -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")))
index af75194a74914467eb73225733aaaba0424a51e6..89880c1300a47ed9589d20b72d784fda4e8b583e 100644 (file)
@@ -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;
index 345fa5aa1eafa1ba39bb20979697088ae4b7fc2b..360a9e6b54d4fb91346e18a73a4c77287a348354 100644 (file)
@@ -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;
index 0041fd3f55ca23f7ed5defb5f2f13d0100010303..9d887f46a9c0e41a673eabcfe528772f89110e04 100644 (file)
@@ -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) {
index 9b134ad3589697c1b35de9625c9bc1ded285e95d..6297ceb0a56d73ab06787a9f6a7bdb754c777984 100644 (file)
@@ -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;
index d23d35e7a88bf28495566bc40482b443484d082e..0127dedd094d5dabd930ff3011866c6017f4612d 100644 (file)
@@ -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;
index ff62b647d270ac7375e3c3571828070dd1d59bd8..42874e944faf0e54735f89ced8bc9e008c0dd70c 100644 (file)
@@ -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;