brcmfmac: change function name for brcmf_cfg80211_wait_vif_event_timeout()
Dropping the '_timeout' from the function name as the fact that a timeout value is passed makes it obvious a timeout is used. Also helps to keep code lines a bit shorter and easier to stick to 80 char boundary. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
parent
49f86ec21c
commit
a9eb0c4b73
|
@ -564,8 +564,8 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wait for firmware event */
|
/* wait for firmware event */
|
||||||
err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
|
err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
|
||||||
BRCMF_VIF_EVENT_TIMEOUT);
|
BRCMF_VIF_EVENT_TIMEOUT);
|
||||||
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
brcmf_err("timeout occurred\n");
|
brcmf_err("timeout occurred\n");
|
||||||
|
@ -6395,8 +6395,9 @@ bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg)
|
||||||
|
|
||||||
return armed;
|
return armed;
|
||||||
}
|
}
|
||||||
int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
|
|
||||||
u8 action, ulong timeout)
|
int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
|
||||||
|
u8 action, ulong timeout)
|
||||||
{
|
{
|
||||||
struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
|
struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
|
||||||
|
|
||||||
|
|
|
@ -402,8 +402,8 @@ bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg,
|
||||||
void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
|
void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
|
||||||
struct brcmf_cfg80211_vif *vif);
|
struct brcmf_cfg80211_vif *vif);
|
||||||
bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
|
bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
|
||||||
int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
|
int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
|
||||||
u8 action, ulong timeout);
|
u8 action, ulong timeout);
|
||||||
s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
|
s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
|
||||||
struct brcmf_if *ifp, bool aborted,
|
struct brcmf_if *ifp, bool aborted,
|
||||||
bool fw_abort);
|
bool fw_abort);
|
||||||
|
|
|
@ -1988,8 +1988,8 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
|
||||||
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_CHANGE,
|
err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_CHANGE,
|
||||||
BRCMF_VIF_EVENT_TIMEOUT);
|
BRCMF_VIF_EVENT_TIMEOUT);
|
||||||
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
|
brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
|
||||||
|
@ -2090,8 +2090,8 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wait for firmware event */
|
/* wait for firmware event */
|
||||||
err = brcmf_cfg80211_wait_vif_event_timeout(p2p->cfg, BRCMF_E_IF_ADD,
|
err = brcmf_cfg80211_wait_vif_event(p2p->cfg, BRCMF_E_IF_ADD,
|
||||||
BRCMF_VIF_EVENT_TIMEOUT);
|
BRCMF_VIF_EVENT_TIMEOUT);
|
||||||
brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
|
brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
|
||||||
brcmf_fweh_p2pdev_setup(pri_ifp, false);
|
brcmf_fweh_p2pdev_setup(pri_ifp, false);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
|
@ -2180,8 +2180,8 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wait for firmware event */
|
/* wait for firmware event */
|
||||||
err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
|
err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
|
||||||
BRCMF_VIF_EVENT_TIMEOUT);
|
BRCMF_VIF_EVENT_TIMEOUT);
|
||||||
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
brcmf_cfg80211_arm_vif_event(cfg, NULL);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
brcmf_err("timeout occurred\n");
|
brcmf_err("timeout occurred\n");
|
||||||
|
@ -2272,8 +2272,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)
|
||||||
}
|
}
|
||||||
if (!err) {
|
if (!err) {
|
||||||
/* wait for firmware event */
|
/* wait for firmware event */
|
||||||
err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_DEL,
|
err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
|
||||||
BRCMF_VIF_EVENT_TIMEOUT);
|
BRCMF_VIF_EVENT_TIMEOUT);
|
||||||
if (!err)
|
if (!err)
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue