diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2015-01-07 08:36:55 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-01-08 08:36:50 +0300 |
| commit | 0333d6dd3bc17468f42d0c455113fd9d50f7746e (patch) | |
| tree | af1d4e11dc2b246d3960aa34e1b03e89f871e2b0 /drivers/bluetooth | |
| parent | 1c6098eb2b95a2af8b8ebaaf61d808b0071b639f (diff) | |
| download | linux-0333d6dd3bc17468f42d0c455113fd9d50f7746e.tar.xz | |
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')
| -rw-r--r-- | drivers/bluetooth/btmrvl_drv.h | 4 | ||||
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h index 5513204c8bb2..e75f8ee2512c 100644 --- a/drivers/bluetooth/btmrvl_drv.h +++ b/drivers/bluetooth/btmrvl_drv.h @@ -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, 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, |