staging: brcm80211: fixed function returns
- removed unneeded return statements at end of functions. - changed return value of brcms_c_radio_monitor_start to void. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
e9d3adbef4
commit
d64bc7c286
1 changed files with 2 additions and 21 deletions
|
@ -1572,8 +1572,6 @@ void brcms_c_ucode_wake_override_set(struct brcms_hardware *wlc_hw,
|
||||||
|
|
||||||
brcms_c_mctrl_write(wlc_hw);
|
brcms_c_mctrl_write(wlc_hw);
|
||||||
brcms_b_wait_for_wake(wlc_hw);
|
brcms_b_wait_for_wake(wlc_hw);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
|
void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
|
||||||
|
@ -1585,8 +1583,6 @@ void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
brcms_c_mctrl_write(wlc_hw);
|
brcms_c_mctrl_write(wlc_hw);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* When driver needs ucode to stop beaconing, it has to make sure that
|
/* When driver needs ucode to stop beaconing, it has to make sure that
|
||||||
|
@ -1607,8 +1603,6 @@ static void brcms_c_ucode_mute_override_set(struct brcms_hardware *wlc_hw)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
brcms_c_mctrl_write(wlc_hw);
|
brcms_c_mctrl_write(wlc_hw);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clear the override on AP and INFRA bits */
|
/* Clear the override on AP and INFRA bits */
|
||||||
|
@ -3217,8 +3211,6 @@ static void brcms_b_pllreq(struct brcms_hardware *wlc_hw, bool set, u32 req_bit)
|
||||||
brcms_b_xtal(wlc_hw, OFF);
|
brcms_b_xtal(wlc_hw, OFF);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail)
|
static void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail)
|
||||||
|
@ -4308,17 +4300,16 @@ static void brcms_c_down_led_upd(struct brcms_c_info *wlc)
|
||||||
brcms_c_pllreq(wlc, false, BRCMS_PLLREQ_FLIP);
|
brcms_c_pllreq(wlc, false, BRCMS_PLLREQ_FLIP);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool brcms_c_radio_monitor_start(struct brcms_c_info *wlc)
|
static void brcms_c_radio_monitor_start(struct brcms_c_info *wlc)
|
||||||
{
|
{
|
||||||
/* Don't start the timer if HWRADIO feature is disabled */
|
/* Don't start the timer if HWRADIO feature is disabled */
|
||||||
if (wlc->radio_monitor)
|
if (wlc->radio_monitor)
|
||||||
return true;
|
return;
|
||||||
|
|
||||||
wlc->radio_monitor = true;
|
wlc->radio_monitor = true;
|
||||||
brcms_c_pllreq(wlc, true, BRCMS_PLLREQ_RADIO_MON);
|
brcms_c_pllreq(wlc, true, BRCMS_PLLREQ_RADIO_MON);
|
||||||
brcms_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK,
|
brcms_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK,
|
||||||
true);
|
true);
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void brcms_c_radio_disable(struct brcms_c_info *wlc)
|
void brcms_c_radio_disable(struct brcms_c_info *wlc)
|
||||||
|
@ -6123,8 +6114,6 @@ static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc)
|
||||||
r = wlc->default_bss->rateset.rates[0];
|
r = wlc->default_bss->rateset.rates[0];
|
||||||
|
|
||||||
wlc_phy_ofdm_rateset_war(wlc->band->pi, war);
|
wlc_phy_ofdm_rateset_war(wlc->band->pi, war);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel)
|
int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel)
|
||||||
|
@ -7785,8 +7774,6 @@ brcms_c_compute_ofdm_plcp(u32 rspec, u32 length, u8 *plcp)
|
||||||
plcp[2] |= (tmp >> 16) & 0xff;
|
plcp[2] |= (tmp >> 16) & 0xff;
|
||||||
plcp[1] |= (tmp >> 8) & 0xff;
|
plcp[1] |= (tmp >> 8) & 0xff;
|
||||||
plcp[0] |= tmp & 0xff;
|
plcp[0] |= tmp & 0xff;
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Rate: 802.11 rate code, length: PSDU length in octets */
|
/* Rate: 802.11 rate code, length: PSDU length in octets */
|
||||||
|
@ -7808,7 +7795,6 @@ brcms_c_compute_plcp(struct brcms_c_info *wlc, u32 rspec,
|
||||||
brcms_c_compute_ofdm_plcp(rspec, length, plcp);
|
brcms_c_compute_ofdm_plcp(rspec, length, plcp);
|
||||||
else
|
else
|
||||||
brcms_c_compute_cck_plcp(wlc, rspec, length, plcp);
|
brcms_c_compute_cck_plcp(wlc, rspec, length, plcp);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* brcms_c_compute_rtscts_dur()
|
/* brcms_c_compute_rtscts_dur()
|
||||||
|
@ -7997,8 +7983,6 @@ brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
|
||||||
/* read the tsf timer low, then high to get an atomic read */
|
/* read the tsf timer low, then high to get an atomic read */
|
||||||
*tsf_l_ptr = R_REG(®s->tsf_timerlow);
|
*tsf_l_ptr = R_REG(®s->tsf_timerlow);
|
||||||
*tsf_h_ptr = R_REG(®s->tsf_timerhigh);
|
*tsf_h_ptr = R_REG(®s->tsf_timerhigh);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -8175,7 +8159,6 @@ brcms_c_recvctl(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
|
||||||
|
|
||||||
memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
|
memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
|
||||||
ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
|
ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Process received frames */
|
/* Process received frames */
|
||||||
|
@ -8683,8 +8666,6 @@ brcms_c_bcn_prb_template(struct brcms_c_info *wlc, u16 type,
|
||||||
memcpy(&h->bssid, &cfg->BSSID, ETH_ALEN);
|
memcpy(&h->bssid, &cfg->BSSID, ETH_ALEN);
|
||||||
|
|
||||||
/* SEQ filled in by MAC */
|
/* SEQ filled in by MAC */
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int brcms_c_get_header_len(void)
|
int brcms_c_get_header_len(void)
|
||||||
|
|
Loading…
Add table
Reference in a new issue