summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_main.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2015-01-06 21:36:55 -0800
committerMarcel Holtmann <marcel@holtmann.org>2015-01-08 06:36:50 +0100
commit0333d6dd3bc17468f42d0c455113fd9d50f7746e (patch)
treeaf1d4e11dc2b246d3960aa34e1b03e89f871e2b0 /drivers/bluetooth/btmrvl_main.c
parent1c6098eb2b95a2af8b8ebaaf61d808b0071b639f (diff)
downloadlinux-0333d6dd3bc17468f42d0c455113fd9d50f7746e.tar.bz2
Bluetooth: btmrvl: use msecs_to_jiffies within macro definition
This change improves readability and fixes allignment problem. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btmrvl_main.c')
-rw-r--r--drivers/bluetooth/btmrvl_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index c4a542cc3214..2578b29f1cd1 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -207,8 +207,8 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode,
wake_up_interruptible(&priv->main_thread.wait_q);
if (!wait_event_interruptible_timeout(priv->adapter->cmd_wait_q,
- priv->adapter->cmd_complete,
- msecs_to_jiffies(WAIT_UNTIL_CMD_RESP)))
+ priv->adapter->cmd_complete,
+ 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,