diff options
author | Jason Cooper <jason@lakedaemon.net> | 2010-10-11 10:02:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-12 08:52:28 -0700 |
commit | b4f790eeb36564c7e4a5b38712f23ebc2b64b45a (patch) | |
tree | 4c4c759024283fea3bcb80ead8fb538c59ef9100 /drivers/staging/brcm80211/sys | |
parent | 2184ccb9f7069a03e0b51f68216ab61cec54b3f6 (diff) | |
download | op-kernel-dev-b4f790eeb36564c7e4a5b38712f23ebc2b64b45a.zip op-kernel-dev-b4f790eeb36564c7e4a5b38712f23ebc2b64b45a.tar.gz |
staging: brcm80211: remove BCMINITFN() macro.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys')
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 22 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wlc_mac80211.c | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index c985192..345fa5a 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -1119,7 +1119,7 @@ int wlc_bmac_detach(wlc_info_t *wlc) } -void BCMINITFN(wlc_bmac_reset) (wlc_hw_info_t *wlc_hw) +void wlc_bmac_reset(wlc_hw_info_t *wlc_hw) { WL_TRACE(("wl%d: wlc_bmac_reset\n", wlc_hw->unit)); @@ -1136,7 +1136,7 @@ void BCMINITFN(wlc_bmac_reset) (wlc_hw_info_t *wlc_hw) } void -BCMINITFN(wlc_bmac_init) (wlc_hw_info_t *wlc_hw, chanspec_t chanspec, +wlc_bmac_init(wlc_hw_info_t *wlc_hw, chanspec_t chanspec, bool mute) { u32 macintmask; bool fastclk; @@ -1187,7 +1187,7 @@ BCMINITFN(wlc_bmac_init) (wlc_hw_info_t *wlc_hw, chanspec_t chanspec, wlc_clkctl_clk(wlc_hw, CLK_DYNAMIC); } -int BCMINITFN(wlc_bmac_up_prep) (wlc_hw_info_t *wlc_hw) +int wlc_bmac_up_prep(wlc_hw_info_t *wlc_hw) { uint coremask; @@ -1235,7 +1235,7 @@ int BCMINITFN(wlc_bmac_up_prep) (wlc_hw_info_t *wlc_hw) return 0; } -int BCMINITFN(wlc_bmac_up_finish) (wlc_hw_info_t *wlc_hw) +int wlc_bmac_up_finish(wlc_hw_info_t *wlc_hw) { WL_TRACE(("wl%d: %s:\n", wlc_hw->unit, __func__)); @@ -1456,7 +1456,7 @@ static void wlc_clkctl_clk(wlc_hw_info_t *wlc_hw, uint mode) /* set initial host flags value */ static void -BCMINITFN(wlc_mhfdef) (wlc_info_t *wlc, u16 *mhfs, u16 mhf2_init) +wlc_mhfdef(wlc_info_t *wlc, u16 *mhfs, u16 mhf2_init) { wlc_hw_info_t *wlc_hw = wlc->hw; @@ -2176,7 +2176,7 @@ static bool wlc_validboardtype(wlc_hw_info_t *wlc_hw) return goodboard; } -static char *BCMINITFN(wlc_get_macaddr) (wlc_hw_info_t *wlc_hw) +static char *wlc_get_macaddr(wlc_hw_info_t *wlc_hw) { const char *varname = "macaddr"; char *macaddr; @@ -2251,7 +2251,7 @@ bool wlc_bmac_radio_read_hwdisabled(wlc_hw_info_t *wlc_hw) } /* Initialize just the hardware when coming out of POR or S3/S5 system states */ -void BCMINITFN(wlc_bmac_hw_up) (wlc_hw_info_t *wlc_hw) +void wlc_bmac_hw_up(wlc_hw_info_t *wlc_hw) { if (wlc_hw->wlc->pub->hw_up) return; @@ -2326,7 +2326,7 @@ static bool wlc_dma_rxreset(wlc_hw_info_t *wlc_hw, uint fifo) * clear software macintstatus for fresh new start * one testing hack wlc_hw->noreset will bypass the d11/phy reset */ -void BCMINITFN(wlc_bmac_corereset) (wlc_hw_info_t *wlc_hw, u32 flags) +void wlc_bmac_corereset(wlc_hw_info_t *wlc_hw, u32 flags) { d11regs_t *regs; uint i; @@ -2415,7 +2415,7 @@ void BCMINITFN(wlc_bmac_corereset) (wlc_hw_info_t *wlc_hw, u32 flags) * txfifo sizes needs to be modified(increased) since the newer cores * have more memory. */ -static void BCMINITFN(wlc_corerev_fifofixup) (wlc_hw_info_t *wlc_hw) +static void wlc_corerev_fifofixup(wlc_hw_info_t *wlc_hw) { d11regs_t *regs = wlc_hw->regs; u16 fifo_nu; @@ -2475,7 +2475,7 @@ static void BCMINITFN(wlc_corerev_fifofixup) (wlc_hw_info_t *wlc_hw) * config other core registers * init dma */ -static void BCMINITFN(wlc_coreinit) (wlc_info_t *wlc) +static void wlc_coreinit(wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs; @@ -2717,7 +2717,7 @@ void wlc_bmac_switch_macfreq(wlc_hw_info_t *wlc_hw, u8 spurmode) } /* Initialize GPIOs that are controlled by D11 core */ -static void BCMINITFN(wlc_gpio_init) (wlc_info_t *wlc) +static void wlc_gpio_init(wlc_info_t *wlc) { wlc_hw_info_t *wlc_hw = wlc->hw; d11regs_t *regs; diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index badc33d..9b134ad 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -381,7 +381,7 @@ bool wlc_ps_allowed(wlc_info_t *wlc) return TRUE; } -void BCMINITFN(wlc_reset) (wlc_info_t *wlc) +void wlc_reset(wlc_info_t *wlc) { WL_TRACE(("wl%d: wlc_reset\n", wlc->pub->unit)); @@ -428,7 +428,7 @@ void wlc_fatal_error(wlc_info_t *wlc) * if other configurations are in conflict (bandlocked, 11n mode disabled, * invalid channel for current country, etc.) */ -static chanspec_t BCMINITFN(wlc_init_chanspec) (wlc_info_t *wlc) +static chanspec_t wlc_init_chanspec(wlc_info_t *wlc) { chanspec_t chanspec = 1 | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE | @@ -452,7 +452,7 @@ static void wlc_init_scb(wlc_info_t *wlc, struct scb *scb) scb->seqnum[i] = 0; } -void BCMINITFN(wlc_init) (wlc_info_t *wlc) +void wlc_init(wlc_info_t *wlc) { d11regs_t *regs; chanspec_t chanspec; @@ -2719,7 +2719,7 @@ static void wlc_watchdog(void *arg) } /* make interface operational */ -int BCMINITFN(wlc_up) (wlc_info_t *wlc) +int wlc_up(wlc_info_t *wlc) { WL_TRACE(("wl%d: %s:\n", wlc->pub->unit, __func__)); @@ -2827,7 +2827,7 @@ int BCMINITFN(wlc_up) (wlc_info_t *wlc) } /* Initialize the base precedence map for dequeueing from txq based on WME settings */ -static void BCMINITFN(wlc_tx_prec_map_init) (wlc_info_t *wlc) +static void wlc_tx_prec_map_init(wlc_info_t *wlc) { wlc->tx_prec_map = WLC_PREC_BMP_ALL; bzero(wlc->fifo2prec_map, sizeof(u16) * NFIFO); |