diff mbox

[01/21] brcmfmac: change function name for brcmf_cfg80211_wait_vif_event_timeout()

Message ID 1455704830-10088-2-git-send-email-arend@broadcom.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Arend van Spriel Feb. 17, 2016, 10:26 a.m. UTC 
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>
---
 .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c  |  9 +++++----
 .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h  |  4 ++--
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c   | 16 ++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

Comments

Kalle Valo March 7, 2016, 12:19 p.m. UTC | #1 
> 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>

Thanks, 20 patches applied to wireless-drivers-next.git:

a9eb0c4b73e7 brcmfmac: change function name for brcmf_cfg80211_wait_vif_event_timeout()
d536733442d1 brcmfmac: Limit memory allocs to <64K
6ea09153b6cc brcmfmac: check for wowl support before enumerating feature flag
73345fd21298 brcmfmac: Configure country code using device specific settings
0aedbcaf6f18 brcmfmac: Add length checks on firmware events
52f22fb21764 brcmfmac: add neighbor discovery offload ip address table configuration
cd2bc19c61b2 brcmfmac: check return for ARP ip setting iovar
6ac27689b01e brcmfmac: use device memsize config from fw if defined
9300bf8610fd brcmfmac: use bar1 window size as provided by pci subsystem
bc86fdb9ac02 brcmfmac: add support for the PCIE 4366c0 chip
d457a44fd85c brcmfmac: remove pcie gen1 support
e9217b4b62a7 brcmfmac: increase timeout for tx eapol
d84d99e00777 brcmfmac: move module init and exit to common
5c22fb85102a brcmfmac: add wowl gtk rekeying offload support
8ea56be0869f brcmfmac: move platform data retrieval code to common
73ef9e640e94 brcmfmac: keep ARP and ND offload enabled during WOWL
4d7928959832 brcmfmac: switch to new platform data
af5b5e62f72e brcmfmac: merge platform data and module paramaters
219e0f747ad6 brcmfmac: integrate add_keyext in add_key
240d61a9ddeb brcmfmac: add 802.11w management frame protection support

1 patches skipped:

[17/21] brcmfmac: fix sdio sg table alloc crash

There was a conflict so please rebase that patch:

Applying: brcmfmac: fix sdio sg table alloc crash
fatal: sha1 information is lacking or useless (drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 brcmfmac: fix sdio sg table alloc crash

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo March 7, 2016, 12:49 p.m. UTC | #2 
Kalle Valo <kvalo@codeaurora.org> writes:

> 1 patches skipped:
>
> [17/21] brcmfmac: fix sdio sg table alloc crash
>
> There was a conflict so please rebase that patch:
>
> Applying: brcmfmac: fix sdio sg table alloc crash
> fatal: sha1 information is lacking or useless (drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 brcmfmac: fix sdio sg table alloc crash

Ah, I noticed only now your comment that this patch is in
wireless-drivers already. So no actions needed.

But in the future please don't submit the same patch twice, otherwise I
accidentally commit it twice which is bad. Instead document the
dependency and we can sort it out.
Arend van Spriel March 7, 2016, 8:03 p.m. UTC | #3 
On Mon, Mar 7, 2016 at 1:49 PM, Kalle Valo <kvalo@codeaurora.org> wrote:
> Kalle Valo <kvalo@codeaurora.org> writes:
>
>> 1 patches skipped:
>>
>> [17/21] brcmfmac: fix sdio sg table alloc crash
>>
>> There was a conflict so please rebase that patch:
>>
>> Applying: brcmfmac: fix sdio sg table alloc crash
>> fatal: sha1 information is lacking or useless (drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 brcmfmac: fix sdio sg table alloc crash
>
> Ah, I noticed only now your comment that this patch is in
> wireless-drivers already. So no actions needed.
>
> But in the future please don't submit the same patch twice, otherwise I
> accidentally commit it twice which is bad. Instead document the
> dependency and we can sort it out.

Yeah. We already discussed this earlier [1]. Has been noted.

Thanks,
Arend

[1] http://article.gmane.org/gmane.linux.kernel.wireless.general/148691

> --
> Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo March 8, 2016, 8:46 a.m. UTC | #4 
Arend Van Spriel <arend.vanspriel@broadcom.com> writes:

>> But in the future please don't submit the same patch twice, otherwise I
>> accidentally commit it twice which is bad. Instead document the
>> dependency and we can sort it out.
>
> Yeah. We already discussed this earlier [1]. Has been noted.

Heh, sorry. I had totally forgetten that :)
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index d00c5c1..5a4a0c4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -564,8 +564,8 @@  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,
-						    BRCMF_VIF_EVENT_TIMEOUT);
+	err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
+					    BRCMF_VIF_EVENT_TIMEOUT);
 	brcmf_cfg80211_arm_vif_event(cfg, NULL);
 	if (!err) {
 		brcmf_err("timeout occurred\n");
@@ -6395,8 +6395,9 @@  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,
-					  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;
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
index 40efb53..97c327d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -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,
 				  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,
-					  u8 action, ulong timeout);
+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,
 				bool fw_abort);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 821b649..de5892a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -1988,8 +1988,8 @@  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,
-						    BRCMF_VIF_EVENT_TIMEOUT);
+	err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_CHANGE,
+					    BRCMF_VIF_EVENT_TIMEOUT);
 	brcmf_cfg80211_arm_vif_event(cfg, NULL);
 	if (!err)  {
 		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 */
-	err = brcmf_cfg80211_wait_vif_event_timeout(p2p->cfg, BRCMF_E_IF_ADD,
-						    BRCMF_VIF_EVENT_TIMEOUT);
+	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);
 	if (!err) {
@@ -2180,8 +2180,8 @@  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,
-						    BRCMF_VIF_EVENT_TIMEOUT);
+	err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
+					    BRCMF_VIF_EVENT_TIMEOUT);
 	brcmf_cfg80211_arm_vif_event(cfg, NULL);
 	if (!err) {
 		brcmf_err("timeout occurred\n");
@@ -2272,8 +2272,8 @@  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,
-							BRCMF_VIF_EVENT_TIMEOUT);
+		err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
+						    BRCMF_VIF_EVENT_TIMEOUT);
 		if (!err)
 			err = -EIO;
 		else