Commit 2755f6ad authored by Marcel Holtmann's avatar Marcel Holtmann

[Bluetooth] Remove interruptible_sleep_on_timeout() usage

Remove deprecated interruptible_sleep_on_timeout() function calls
and replace them with direct wait-queue usage.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 524e4ea8
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/wait.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -289,8 +290,9 @@ static void bluecard_write_wakeup(bluecard_info_t *info) ...@@ -289,8 +290,9 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
clear_bit(ready_bit, &(info->tx_state)); clear_bit(ready_bit, &(info->tx_state));
if (skb->pkt_type & 0x80) { if (skb->pkt_type & 0x80) {
DECLARE_WAIT_QUEUE_HEAD(wq);
DEFINE_WAIT(wait);
wait_queue_head_t wait;
unsigned char baud_reg; unsigned char baud_reg;
switch (skb->pkt_type) { switch (skb->pkt_type) {
...@@ -311,8 +313,9 @@ static void bluecard_write_wakeup(bluecard_info_t *info) ...@@ -311,8 +313,9 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
} }
/* Wait until the command reaches the baseband */ /* Wait until the command reaches the baseband */
init_waitqueue_head(&wait); prepare_to_wait(&wq, &wait, TASK_INTERRUPTIBLE);
interruptible_sleep_on_timeout(&wait, HZ / 10); schedule_timeout(HZ/10);
finish_wait(&wq, &wait);
/* Set baud on baseband */ /* Set baud on baseband */
info->ctrl_reg &= ~0x03; info->ctrl_reg &= ~0x03;
...@@ -324,8 +327,9 @@ static void bluecard_write_wakeup(bluecard_info_t *info) ...@@ -324,8 +327,9 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
outb(info->ctrl_reg, iobase + REG_CONTROL); outb(info->ctrl_reg, iobase + REG_CONTROL);
/* Wait before the next HCI packet can be send */ /* Wait before the next HCI packet can be send */
interruptible_sleep_on_timeout(&wait, HZ); prepare_to_wait(&wq, &wait, TASK_INTERRUPTIBLE);
schedule_timeout(HZ);
finish_wait(&wq, &wait);
} }
if (len == skb->len) { if (len == skb->len) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment