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

Commit 0333d6dd authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Marcel Holtmann
Browse files

Bluetooth: btmrvl: use msecs_to_jiffies within macro definition 



This change improves readability and fixes allignment problem.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 1c6098eb

drivers/bluetooth/btmrvl_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#define BTM_UPLD_SIZE			2312



/* Time to wait until Host Sleep state change in millisecond */

#define WAIT_UNTIL_HS_STATE_CHANGED	5000

#define WAIT_UNTIL_HS_STATE_CHANGED	msecs_to_jiffies(5000)

/* Time to wait for command response in millisecond */

#define WAIT_UNTIL_CMD_RESP		5000

#define WAIT_UNTIL_CMD_RESP		msecs_to_jiffies(5000)



enum rdwr_status {

	RDWR_STATUS_SUCCESS = 0,

drivers/bluetooth/btmrvl_main.c

+3 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode, 


	if (!wait_event_interruptible_timeout(priv->adapter->cmd_wait_q,

					      priv->adapter->cmd_complete,

				msecs_to_jiffies(WAIT_UNTIL_CMD_RESP)))

					      WAIT_UNTIL_CMD_RESP))

		return -ETIMEDOUT;



	return 0;
@@ -293,7 +293,7 @@ int btmrvl_enable_hs(struct btmrvl_private *priv) 


	ret = wait_event_interruptible_timeout(adapter->event_hs_wait_q,

					       adapter->hs_state,

			msecs_to_jiffies(WAIT_UNTIL_HS_STATE_CHANGED));

					       WAIT_UNTIL_HS_STATE_CHANGED);

	if (ret < 0) {

		BT_ERR("event_hs_wait_q terminated (%d): %d,%d,%d",

		       ret, adapter->hs_state, adapter->ps_state,