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

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

brcmfmac: use msecs_to_jiffies() in macro definitions 



Instead to having macro definition for millisecond timeout have
the definition directly in jiffies. This makes the unit of the
value immediately clear and may result in code that is bit more
compact.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@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 4011fc49

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

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,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,

						    msecs_to_jiffies(1500));

						    BRCMF_VIF_EVENT_TIMEOUT);

	brcmf_cfg80211_arm_vif_event(cfg, NULL);

	if (!err) {

		brcmf_err("timeout occurred\n");

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

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ 
#define BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON	2

#define BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_OFF	4



#define BRCMF_VIF_EVENT_TIMEOUT		msecs_to_jiffies(1500)



/**

 * enum brcmf_scan_status - scan engine status

 *

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

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ MODULE_AUTHOR("Broadcom Corporation"); 
MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");

MODULE_LICENSE("Dual BSD/GPL");



#define MAX_WAIT_FOR_8021X_TX		50	/* msecs */

#define MAX_WAIT_FOR_8021X_TX			msecs_to_jiffies(50)



/* AMPDU rx reordering definitions */

#define BRCMF_RXREORDER_FLOWID_OFFSET		0
@@ -1282,7 +1282,7 @@ int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp) 


	err = wait_event_timeout(ifp->pend_8021x_wait,

				 !brcmf_get_pend_8021x_cnt(ifp),

				 msecs_to_jiffies(MAX_WAIT_FOR_8021X_TX));

				 MAX_WAIT_FOR_8021X_TX);



	WARN_ON(!err);

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

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "tracepoint.h"





#define MSGBUF_IOCTL_RESP_TIMEOUT		2000

#define MSGBUF_IOCTL_RESP_TIMEOUT		msecs_to_jiffies(2000)



#define MSGBUF_TYPE_GEN_STATUS			0x1

#define MSGBUF_TYPE_RING_STATUS			0x2
@@ -466,7 +466,7 @@ static int brcmf_msgbuf_ioctl_resp_wait(struct brcmf_msgbuf *msgbuf) 
{

	return wait_event_timeout(msgbuf->ioctl_resp_wait,

				  msgbuf->ctl_completed,

				  msecs_to_jiffies(MSGBUF_IOCTL_RESP_TIMEOUT));

				  MSGBUF_IOCTL_RESP_TIMEOUT);

}

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

+9 −9
Original line number Diff line number Diff line
@@ -71,10 +71,10 @@ 
#define P2P_AF_MED_DWELL_TIME		400

#define P2P_AF_LONG_DWELL_TIME		1000

#define P2P_AF_TX_MAX_RETRY		1

#define P2P_AF_MAX_WAIT_TIME		2000

#define P2P_AF_MAX_WAIT_TIME		msecs_to_jiffies(2000)

#define P2P_INVALID_CHANNEL		-1

#define P2P_CHANNEL_SYNC_RETRY		5

#define P2P_AF_FRM_SCAN_MAX_WAIT	1500

#define P2P_AF_FRM_SCAN_MAX_WAIT	msecs_to_jiffies(1500)

#define P2P_DEFAULT_SLEEP_TIME_VSDB	200



/* WiFi P2P Public Action Frame OUI Subtypes */
@@ -102,6 +102,7 @@ 
#define P2PSD_ACTION_ID_GAS_CREQ	0x0c	/* GAS Comback Request AF */

#define P2PSD_ACTION_ID_GAS_CRESP	0x0d	/* GAS Comback Response AF */



#define BRCMF_P2P_DISABLE_TIMEOUT	msecs_to_jiffies(500)

/**

 * struct brcmf_p2p_disc_st_le - set discovery state in firmware.

 *
@@ -1514,7 +1515,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p, 
	p2p->af_tx_sent_jiffies = jiffies;



	timeout = wait_for_completion_timeout(&p2p->send_af_done,

					msecs_to_jiffies(P2P_AF_MAX_WAIT_TIME));

					      P2P_AF_MAX_WAIT_TIME);



	if (test_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status)) {

		brcmf_dbg(TRACE, "TX action frame operation is success\n");
@@ -1988,7 +1989,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg, 
		return err;

	}

	err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_CHANGE,

						    msecs_to_jiffies(1500));

						    BRCMF_VIF_EVENT_TIMEOUT);

	brcmf_cfg80211_arm_vif_event(cfg, NULL);

	if (!err)  {

		brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
@@ -2090,7 +2091,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,

						    msecs_to_jiffies(1500));

						    BRCMF_VIF_EVENT_TIMEOUT);

	brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);

	brcmf_fweh_p2pdev_setup(pri_ifp, false);

	if (!err) {
@@ -2180,7 +2181,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,

						    msecs_to_jiffies(1500));

						    BRCMF_VIF_EVENT_TIMEOUT);

	brcmf_cfg80211_arm_vif_event(cfg, NULL);

	if (!err) {

		brcmf_err("timeout occurred\n");
@@ -2230,7 +2231,6 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) 
	struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);

	struct brcmf_p2p_info *p2p = &cfg->p2p;

	struct brcmf_cfg80211_vif *vif;

	unsigned long jiffie_timeout = msecs_to_jiffies(1500);

	bool wait_for_disable = false;

	int err;
@@ -2263,7 +2263,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) 


	if (wait_for_disable)

		wait_for_completion_timeout(&cfg->vif_disabled,

					    msecs_to_jiffies(500));

					    BRCMF_P2P_DISABLE_TIMEOUT);



	err = 0;

	if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE) {
@@ -2273,7 +2273,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,

							    jiffie_timeout);

							BRCMF_VIF_EVENT_TIMEOUT);

		if (!err)

			err = -EIO;

		else