1/34: atm/horizon: replace interruptible_sleep_on()
Subsystems (2)
PATCH 1/1 1/34: atm/horizon: replace interruptible_sleep_on()
Hi,
Please consider applying.
Description: Use wait_event_interruptible() instead of the deprecated interruptible_sleep_on(). In the new code, the debug statements will *not* be printed every iteration of the loop; instead they will be printed before the sleep begins and after the sleep is completed. Patch is compile-tested.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/atm/horizon.c +6 -7
@@ -39,6 +39,7 @@#include <linux/uio.h> #include <linux/init.h> #include <linux/ioport.h> +#include <linux/wait.h> #include <asm/system.h> #include <asm/io.h>
@@ -1089,13 +1090,11 @@ static inline void rx_bus_master_complet/********** (queue to) become the next TX thread **********/ static inline int tx_hold (hrz_dev * dev) { -while (test_and_set_bit (tx_busy, &dev->flags)) { -PRINTD (DBG_TX ,"sleeping at tx lock %p %lu" , dev, dev->flags); -interruptible_sleep_on (&dev->tx_queue); -PRINTD (DBG_TX ,"woken at tx lock %p %lu" , dev, dev->flags); -if (signal_pending (current)) -return -1 ; - } +PRINTD (DBG_TX ,"sleeping at tx lock %p %lu" , dev, dev->flags); +wait_event_interruptible (dev->tx_queue, (!test_and_set_bit (tx_busy, &dev->flags))); +PRINTD (DBG_TX ,"woken at tx lock %p %lu" , dev, dev->flags); +if (signal_pending (current)) +return -1 ;PRINTD (DBG_TX ,"set tx_busy for dev %p" , dev);return 0 ; }
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors