bluetooth/bluecard_cs: remove
Subsystems (2)
PATCH 1/1 bluetooth/bluecard_cs: remove
Hello,
This patch should not have the oops problems that the original did. Marcel, please test when you get the chance.
Thanks,
Nish
Description: Remove deprecated interruptible_sleep_on_timeout() function calls and replace with direct wait-queue usage. Some naming conflicts occurred, which I tried to resolve appropriately. Patch is compile-tested.
drivers/bluetooth/bluecard_cs.c +9 -5
@@ -35,6 +35,7 @@#include <linux/ioport.h> #include <linux/spinlock.h> #include <linux/moduleparam.h> +#include <linux/wait.h> #include <linux/skbuff.h> #include <asm/io.h>
@@ -289,8 +290,9 @@ static void bluecard_write_wakeup(bluecaclear_bit (ready_bit, &(info->tx_state));if (skb->pkt_type &0x80 ) { +DECLARE_WAIT_QUEUE_HEAD (wq); +DEFINE_WAIT (wait); -wait_queue_head_t wait;unsigned char baud_reg;switch (skb->pkt_type) {
@@ -311,8 +313,9 @@ static void bluecard_write_wakeup(blueca }/* Wait until the command reaches the baseband */ -init_waitqueue_head (&wait); -interruptible_sleep_on_timeout (&wait,HZ /10 ); +prepare_to_wait (&wq, &wait,TASK_INTERRUPTIBLE ); +schedule_timeout (HZ /10 ); +finish_wait (&wq, &wait);/* Set baud on baseband */ info->ctrl_reg &= ~0x03 ;
@@ -324,8 +327,9 @@ static void bluecard_write_wakeup(bluecaoutb (info->ctrl_reg, iobase +REG_CONTROL );/* 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) {
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
Marcel Holtmann
maintainerHi Nish,
Quoted 1 line
This patch should not have the oops problems that the original did.
this version is working and applied to my tree.
Regards
Marcel
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors