diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2015-01-07 00:36:55 -0500 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-01-08 00:36:50 -0500 |
| commit | 0333d6dd3bc17468f42d0c455113fd9d50f7746e (patch) | |
| tree | af1d4e11dc2b246d3960aa34e1b03e89f871e2b0 | |
| parent | 1c6098eb2b95a2af8b8ebaaf61d808b0071b639f (diff) | |
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>
| -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 @@ | |||
| 28 | #define BTM_UPLD_SIZE 2312 | 28 | #define BTM_UPLD_SIZE 2312 |
| 29 | 29 | ||
| 30 | /* Time to wait until Host Sleep state change in millisecond */ | 30 | /* Time to wait until Host Sleep state change in millisecond */ |
| 31 | #define WAIT_UNTIL_HS_STATE_CHANGED 5000 | 31 | #define WAIT_UNTIL_HS_STATE_CHANGED msecs_to_jiffies(5000) |
| 32 | /* Time to wait for command response in millisecond */ | 32 | /* Time to wait for command response in millisecond */ |
| 33 | #define WAIT_UNTIL_CMD_RESP 5000 | 33 | #define WAIT_UNTIL_CMD_RESP msecs_to_jiffies(5000) |
| 34 | 34 | ||
| 35 | enum rdwr_status { | 35 | enum rdwr_status { |
| 36 | RDWR_STATUS_SUCCESS = 0, | 36 | 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, | |||
| 207 | wake_up_interruptible(&priv->main_thread.wait_q); | 207 | wake_up_interruptible(&priv->main_thread.wait_q); |
| 208 | 208 | ||
| 209 | if (!wait_event_interruptible_timeout(priv->adapter->cmd_wait_q, | 209 | if (!wait_event_interruptible_timeout(priv->adapter->cmd_wait_q, |
| 210 | priv->adapter->cmd_complete, | 210 | priv->adapter->cmd_complete, |
| 211 | msecs_to_jiffies(WAIT_UNTIL_CMD_RESP))) | 211 | WAIT_UNTIL_CMD_RESP)) |
| 212 | return -ETIMEDOUT; | 212 | return -ETIMEDOUT; |
| 213 | 213 | ||
| 214 | return 0; | 214 | return 0; |
| @@ -293,7 +293,7 @@ int btmrvl_enable_hs(struct btmrvl_private *priv) | |||
| 293 | 293 | ||
| 294 | ret = wait_event_interruptible_timeout(adapter->event_hs_wait_q, | 294 | ret = wait_event_interruptible_timeout(adapter->event_hs_wait_q, |
| 295 | adapter->hs_state, | 295 | adapter->hs_state, |
| 296 | msecs_to_jiffies(WAIT_UNTIL_HS_STATE_CHANGED)); | 296 | WAIT_UNTIL_HS_STATE_CHANGED); |
| 297 | if (ret < 0) { | 297 | if (ret < 0) { |
| 298 | BT_ERR("event_hs_wait_q terminated (%d): %d,%d,%d", | 298 | BT_ERR("event_hs_wait_q terminated (%d): %d,%d,%d", |
| 299 | ret, adapter->hs_state, adapter->ps_state, | 299 | ret, adapter->hs_state, adapter->ps_state, |