1 From: Arend van Spriel <arend@broadcom.com>
2 Date: Wed, 17 Feb 2016 11:26:50 +0100
3 Subject: [PATCH] brcmfmac: change function name for
4 brcmf_cfg80211_wait_vif_event_timeout()
6 Dropping the '_timeout' from the function name as the fact that a timeout
7 value is passed makes it obvious a timeout is used. Also helps to keep code
8 lines a bit shorter and easier to stick to 80 char boundary.
10 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
11 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
12 Signed-off-by: Arend van Spriel <arend@broadcom.com>
13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
16 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
17 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
18 @@ -564,8 +564,8 @@ struct wireless_dev *brcmf_ap_add_vif(st
21 /* wait for firmware event */
22 - err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
23 - BRCMF_VIF_EVENT_TIMEOUT);
24 + err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
25 + BRCMF_VIF_EVENT_TIMEOUT);
26 brcmf_cfg80211_arm_vif_event(cfg, NULL);
28 brcmf_err("timeout occurred\n");
29 @@ -6395,8 +6395,9 @@ bool brcmf_cfg80211_vif_event_armed(stru
33 -int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
34 - u8 action, ulong timeout)
36 +int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
37 + u8 action, ulong timeout)
39 struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
41 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
42 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
43 @@ -402,8 +402,8 @@ bool brcmf_get_vif_state_any(struct brcm
44 void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
45 struct brcmf_cfg80211_vif *vif);
46 bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
47 -int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
48 - u8 action, ulong timeout);
49 +int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
50 + u8 action, ulong timeout);
51 s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
52 struct brcmf_if *ifp, bool aborted,
54 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
55 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
56 @@ -1988,8 +1988,8 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
57 brcmf_cfg80211_arm_vif_event(cfg, NULL);
60 - err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_CHANGE,
61 - BRCMF_VIF_EVENT_TIMEOUT);
62 + err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_CHANGE,
63 + BRCMF_VIF_EVENT_TIMEOUT);
64 brcmf_cfg80211_arm_vif_event(cfg, NULL);
66 brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
67 @@ -2090,8 +2090,8 @@ static struct wireless_dev *brcmf_p2p_cr
70 /* wait for firmware event */
71 - err = brcmf_cfg80211_wait_vif_event_timeout(p2p->cfg, BRCMF_E_IF_ADD,
72 - BRCMF_VIF_EVENT_TIMEOUT);
73 + err = brcmf_cfg80211_wait_vif_event(p2p->cfg, BRCMF_E_IF_ADD,
74 + BRCMF_VIF_EVENT_TIMEOUT);
75 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
76 brcmf_fweh_p2pdev_setup(pri_ifp, false);
78 @@ -2180,8 +2180,8 @@ struct wireless_dev *brcmf_p2p_add_vif(s
81 /* wait for firmware event */
82 - err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
83 - BRCMF_VIF_EVENT_TIMEOUT);
84 + err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
85 + BRCMF_VIF_EVENT_TIMEOUT);
86 brcmf_cfg80211_arm_vif_event(cfg, NULL);
88 brcmf_err("timeout occurred\n");
89 @@ -2274,8 +2274,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
92 /* wait for firmware event */
93 - err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_DEL,
94 - BRCMF_VIF_EVENT_TIMEOUT);
95 + err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
96 + BRCMF_VIF_EVENT_TIMEOUT);