Skip to content

Commit

Permalink
staging: brcm80211: fix "ERROR: open brace '{' following function dec…
Browse files Browse the repository at this point in the history 
…..."

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jason Cooper authored and Greg Kroah-Hartman committed Sep 14, 2010
1 parent 7cc4a4c commit a2627bc
Show file tree
Hide file tree
Showing 21 changed files with 326 additions and 163 deletions.
24 changes: 16 additions & 8 deletions drivers/staging/brcm80211/phy/wlc_phy_cmn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,8 @@ void mod_phy_reg(phy_info_t *pi, uint16 addr, uint16 mask, uint16 val)
pi->phy_wreg = 0;
}

static void WLBANDINITFN(wlc_set_phy_uninitted) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_set_phy_uninitted) (phy_info_t *pi)
{
int i, j;

pi->initialized = FALSE;
Expand Down Expand Up @@ -544,7 +545,8 @@ 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 *BCMATTACHFN(wlc_phy_shared_attach) (shared_phy_params_t *shp)
{
shared_phy_t *sh;

if ((sh =
Expand Down Expand Up @@ -582,7 +584,8 @@ 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 BCMATTACHFN(wlc_phy_shared_detach) (shared_phy_t *phy_sh)
{
osl_t *osh;

if (phy_sh) {
Expand Down Expand Up @@ -774,7 +777,8 @@ 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 BCMATTACHFN(wlc_phy_detach) (wlc_phy_t *pih)
{
phy_info_t *pi = (phy_info_t *) pih;

if (pih) {
Expand Down Expand Up @@ -912,7 +916,8 @@ uint32 wlc_phy_clk_bwbits(wlc_phy_t *pih)
return phy_bw_clkbits;
}

void WLBANDINITFN(wlc_phy_por_inform) (wlc_phy_t *ppi) {
void WLBANDINITFN(wlc_phy_por_inform) (wlc_phy_t *ppi)
{
phy_info_t *pi = (phy_info_t *) ppi;

pi->phy_init_por = TRUE;
Expand Down Expand Up @@ -957,7 +962,8 @@ void wlc_phy_hw_state_upd(wlc_phy_t *pih, bool newstate)
pi->sh->up = newstate;
}

void WLBANDINITFN(wlc_phy_init) (wlc_phy_t *pih, chanspec_t chanspec) {
void WLBANDINITFN(wlc_phy_init) (wlc_phy_t *pih, chanspec_t chanspec)
{
uint32 mc;
initfn_t phy_init = NULL;
phy_info_t *pi = (phy_info_t *) pih;
Expand Down Expand Up @@ -1016,7 +1022,8 @@ void WLBANDINITFN(wlc_phy_init) (wlc_phy_t *pih, chanspec_t chanspec) {
pi->init_in_progress = FALSE;
}

void BCMINITFN(wlc_phy_cal_init) (wlc_phy_t *pih) {
void BCMINITFN(wlc_phy_cal_init) (wlc_phy_t *pih)
{
phy_info_t *pi = (phy_info_t *) pih;
initfn_t cal_init = NULL;

Expand All @@ -1031,7 +1038,8 @@ void BCMINITFN(wlc_phy_cal_init) (wlc_phy_t *pih) {
}
}

int BCMUNINITFN(wlc_phy_down) (wlc_phy_t *pih) {
int BCMUNINITFN(wlc_phy_down) (wlc_phy_t *pih)
{
phy_info_t *pi = (phy_info_t *) pih;
int callbacks = 0;

Expand Down
33 changes: 22 additions & 11 deletions drivers/staging/brcm80211/phy/wlc_phy_lcn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,8 @@ static void wlc_lcnphy_vbat_temp_sense_setup(phy_info_t *pi, uint8 mode)
OSL_DELAY(999);
}

void WLBANDINITFN(wlc_lcnphy_tx_pwr_ctrl_init) (wlc_phy_t *ppi) {
void WLBANDINITFN(wlc_lcnphy_tx_pwr_ctrl_init) (wlc_phy_t *ppi)
{
lcnphy_txgains_t tx_gains;
uint8 bbmult;
phytbl_info_t tab;
Expand Down Expand Up @@ -3603,7 +3604,8 @@ void wlc_lcnphy_get_tssi(phy_info_t *pi, int8 *ofdm_pwr, int8 *cck_pwr)
}
}

void WLBANDINITFN(wlc_phy_cal_init_lcnphy) (phy_info_t *pi) {
void WLBANDINITFN(wlc_phy_cal_init_lcnphy) (phy_info_t *pi)
{
return;

}
Expand Down Expand Up @@ -3699,7 +3701,8 @@ static void wlc_lcnphy_set_rx_iq_comp(phy_info_t *pi, uint16 a, uint16 b)

}

void WLBANDINITFN(wlc_phy_init_lcnphy) (phy_info_t *pi) {
void WLBANDINITFN(wlc_phy_init_lcnphy) (phy_info_t *pi)
{
uint8 phybw40;
phy_info_lcnphy_t *pi_lcn = pi->u.pi_lcnphy;
phybw40 = CHSPEC_IS40(pi->radio_chanspec);
Expand Down Expand Up @@ -4314,7 +4317,8 @@ static void wlc_lcnphy_load_rfpower(phy_info_t *pi)
}
}

static void WLBANDINITFN(wlc_lcnphy_tbl_init) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_lcnphy_tbl_init) (phy_info_t *pi)
{
uint idx;
uint8 phybw40;
phytbl_info_t tab;
Expand Down Expand Up @@ -4408,7 +4412,8 @@ static void WLBANDINITFN(wlc_lcnphy_tbl_init) (phy_info_t *pi) {
wlc_lcnphy_clear_papd_comptable(pi);
}

static void WLBANDINITFN(wlc_lcnphy_rev0_baseband_init) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_lcnphy_rev0_baseband_init) (phy_info_t *pi)
{
uint16 afectrl1;
phy_info_lcnphy_t *pi_lcn = pi->u.pi_lcnphy;

Expand Down Expand Up @@ -4454,7 +4459,8 @@ static void WLBANDINITFN(wlc_lcnphy_rev0_baseband_init) (phy_info_t *pi) {

}

static void WLBANDINITFN(wlc_lcnphy_rev2_baseband_init) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_lcnphy_rev2_baseband_init) (phy_info_t *pi)
{
if (CHSPEC_IS5G(pi->radio_chanspec)) {
mod_phy_reg(pi, 0x416, (0xff << 0), 80 << 0);

Expand Down Expand Up @@ -4523,7 +4529,8 @@ static void wlc_lcnphy_agc_temp_init(phy_info_t *pi)

}

static void WLBANDINITFN(wlc_lcnphy_bu_tweaks) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_lcnphy_bu_tweaks) (phy_info_t *pi)
{
if (NORADIO_ENAB(pi->pubpi))
return;

Expand Down Expand Up @@ -4577,7 +4584,8 @@ static void WLBANDINITFN(wlc_lcnphy_bu_tweaks) (phy_info_t *pi) {
}
}

static void WLBANDINITFN(wlc_lcnphy_baseband_init) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_lcnphy_baseband_init) (phy_info_t *pi)
{

wlc_lcnphy_tbl_init(pi);
wlc_lcnphy_rev0_baseband_init(pi);
Expand All @@ -4586,7 +4594,8 @@ static void WLBANDINITFN(wlc_lcnphy_baseband_init) (phy_info_t *pi) {
wlc_lcnphy_bu_tweaks(pi);
}

static void WLBANDINITFN(wlc_radio_2064_init) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_radio_2064_init) (phy_info_t *pi)
{
uint32 i;
lcnphy_radio_regs_t *lcnphyregs = NULL;

Expand Down Expand Up @@ -4646,7 +4655,8 @@ static void WLBANDINITFN(wlc_radio_2064_init) (phy_info_t *pi) {
wlc_lcnphy_rc_cal(pi);
}

static void WLBANDINITFN(wlc_lcnphy_radio_init) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_lcnphy_radio_init) (phy_info_t *pi)
{
if (NORADIO_ENAB(pi->pubpi))
return;

Expand Down Expand Up @@ -4707,7 +4717,8 @@ 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 BCMATTACHFN(wlc_phy_txpwr_srom_read_lcnphy) (phy_info_t *pi)
{
int8 txpwr = 0;
int i;
phy_info_lcnphy_t *pi_lcn = pi->u.pi_lcnphy;
Expand Down
24 changes: 16 additions & 8 deletions drivers/staging/brcm80211/phy/wlc_phy_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14209,7 +14209,8 @@ bool wlc_phy_bist_check_phy(wlc_phy_t *pih)
return FALSE;
}

static void WLBANDINITFN(wlc_phy_bphy_init_nphy) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_phy_bphy_init_nphy) (phy_info_t *pi)
{
uint16 addr, val;

ASSERT(ISNPHY(pi));
Expand Down Expand Up @@ -14266,7 +14267,8 @@ wlc_phy_table_read_nphy(phy_info_t *pi, uint32 id, uint32 len, uint32 offset,
wlc_phy_read_table_nphy(pi, &tbl);
}

static void WLBANDINITFN(wlc_phy_static_table_download_nphy) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_phy_static_table_download_nphy) (phy_info_t *pi)
{
uint idx;

if (NREV_GE(pi->pubpi.phy_rev, 16)) {
Expand All @@ -14288,7 +14290,8 @@ static void WLBANDINITFN(wlc_phy_static_table_download_nphy) (phy_info_t *pi) {
}
}

static void WLBANDINITFN(wlc_phy_tbl_init_nphy) (phy_info_t *pi) {
static void WLBANDINITFN(wlc_phy_tbl_init_nphy) (phy_info_t *pi)
{
uint idx = 0;
uint8 antswctrllut;

Expand Down Expand Up @@ -14499,7 +14502,8 @@ 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 BCMATTACHFN(wlc_phy_txpwrctrl_config_nphy) (phy_info_t *pi)
{

if (NREV_GE(pi->pubpi.phy_rev, 3)) {
pi->nphy_txpwrctrl = PHY_TPC_HW_ON;
Expand All @@ -14518,7 +14522,8 @@ static void BCMATTACHFN(wlc_phy_txpwrctrl_config_nphy) (phy_info_t *pi) {
pi->phy_5g_pwrgain = TRUE;
}

void WLBANDINITFN(wlc_phy_init_nphy) (phy_info_t *pi) {
void WLBANDINITFN(wlc_phy_init_nphy) (phy_info_t *pi)
{
uint16 val;
uint16 clip1_ths[2];
nphy_txgains_t target_gain;
Expand Down Expand Up @@ -27740,7 +27745,8 @@ wlc_phy_mcs_to_ofdm_powers_nphy(uint8 *power, uint8 rate_ofdm_start,
}
}

void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi) {
void BCMNMIATTACHFN(wlc_phy_txpwr_apply_nphy) (phy_info_t *pi)
{
uint rate1, rate2, band_num;
uint8 tmp_bw40po = 0, tmp_cddpo = 0, tmp_stbcpo = 0;
uint8 tmp_max_pwr = 0;
Expand Down Expand Up @@ -27937,7 +27943,8 @@ 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 BCMATTACHFN(wlc_phy_txpwr_srom_read_ppr_nphy) (phy_info_t *pi)
{
uint16 bw40po, cddpo, stbcpo, bwduppo;
uint band_num;

Expand Down Expand Up @@ -28144,7 +28151,8 @@ 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 BCMATTACHFN(wlc_phy_txpwr_srom_read_nphy) (phy_info_t *pi)
{

pi->antswitch = (uint8) PHY_GETINTVAR(pi, "antswitch");
pi->aa2g = (uint8) PHY_GETINTVAR(pi, "aa2g");
Expand Down
9 changes: 6 additions & 3 deletions drivers/staging/brcm80211/sys/wlc_alloc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ void *wlc_calloc(osl_t *osh, uint unit, uint size)
return item;
}

void BCMATTACHFN(wlc_tunables_init) (wlc_tunables_t *tunables, uint devid) {
void BCMATTACHFN(wlc_tunables_init) (wlc_tunables_t *tunables, uint devid)
{
tunables->ntxd = NTXD;
tunables->nrxd = NRXD;
tunables->rxbufsz = RXBUFSZ;
Expand Down Expand Up @@ -105,7 +106,8 @@ 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 BCMATTACHFN(wlc_pub_mfree) (osl_t *osh, wlc_pub_t *pub)
{
if (pub == NULL)
return;

Expand Down Expand Up @@ -305,7 +307,8 @@ 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 BCMATTACHFN(wlc_detach_mfree) (wlc_info_t *wlc, osl_t *osh)
{
if (wlc == NULL)
return;

Expand Down
6 changes: 4 additions & 2 deletions drivers/staging/brcm80211/sys/wlc_ampdu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ static INLINE uint16 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 *BCMATTACHFN(wlc_ampdu_attach) (wlc_info_t *wlc)
{
ampdu_info_t *ampdu;
int i;

Expand Down Expand Up @@ -239,7 +240,8 @@ ampdu_info_t *BCMATTACHFN(wlc_ampdu_attach) (wlc_info_t *wlc) {
return ampdu;
}

void BCMATTACHFN(wlc_ampdu_detach) (ampdu_info_t *ampdu) {
void BCMATTACHFN(wlc_ampdu_detach) (ampdu_info_t *ampdu)
{
int i;

if (!ampdu)
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/brcm80211/sys/wlc_antsel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ 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 BCMATTACHFN(wlc_antsel_detach) (antsel_info_t *asi)
{
if (!asi)
return;

Expand Down
Loading

0 comments on commit a2627bc

Please sign in to comment.