Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9eb0c4b authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

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: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 49f86ec2

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+5 −4
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name, 
	}



	/* 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_cfg80211_arm_vif_event(cfg, NULL);

	if (!err) {
@@ -6395,7 +6395,8 @@ bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg) 


	return armed;

}

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)

{

	struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h

+2 −2
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, 
void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,

				  struct brcmf_cfg80211_vif *vif);

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);

s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,

				struct brcmf_if *ifp, bool aborted,

drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c

+8 −8
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg, 
		brcmf_cfg80211_arm_vif_event(cfg, NULL);

		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_cfg80211_arm_vif_event(cfg, NULL);

	if (!err)  {
@@ -2090,7 +2090,7 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p, 
	}



	/* 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_cfg80211_arm_vif_event(p2p->cfg, NULL);

	brcmf_fweh_p2pdev_setup(pri_ifp, false);
@@ -2180,7 +2180,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, 
	}



	/* 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_cfg80211_arm_vif_event(cfg, NULL);

	if (!err) {
@@ -2272,7 +2272,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) 
	}

	if (!err) {

		/* 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);

		if (!err)

			err = -EIO;