Skip to contentSkip to conversation

media/cx88-tvaudio:

PATCH Applied Nishanth Aravamudan 5 participants 5 messages Sep 20, 2004 – Sep 29, 2004 Kernel janitors

lore
Share & tools
lore

Nishanth Aravamudan

author
#0 lore raw

Sorry this should have been 5/17.

Quoted 18 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/media/video/cx88/cx88-tvaudio.c +1 -0
@@ -49,6 +49,7 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
+#include <linux/delay.h>
 
 #include "cx88.h"

drivers/media/video/cx88/cx88-tvaudio.c int cx88_audio_thread(void *data) · line 792

Quoted 9 lines
drivers/media/video/cx88/cx88-tvaudio.c +1 -2
@@ -785,8 +786,7 @@ int cx88_audio_thread(void *data)
 	dprintk("cx88: tvaudio thread started\n");
 
 	for (;;) {
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(HZ*3);
+		msleep_interruptible(3000);
 		if (signal_pending(current))
 			break;
 		if (dev->shutdown)

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw

[Kernel-janitors] Re: [PATCH 2.6.9-rc2 4/6] serial/mcfserial:

In reply to Nishanth Aravamudan

Hi Nishanth,

Quoted 5 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Use set_current_state() instead of direct assignment of current->state.

Looks ok to me.

Regards
Greg

Quoted 40 lines
drivers/serial/mcfserial.c +4 -5
@@ -34,6 +34,7 @@
 #include <linux/serialP.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>

@@ -997,7 +998,7 @@ static void send_break(	struct mcf_seria
 
 	if (!info->addr)
 		return;
-	current->state = TASK_INTERRUPTIBLE;
+	set_current_state(TASK_INTERRUPTIBLE);
 	uartp = info->addr;
 
 	local_irq_save(flags);

@@ -1247,8 +1248,7 @@ static void mcfrs_close(struct tty_struc
 	}
 	if (info->blocked_open) {
 		if (info->close_delay) {
-			current->state = TASK_INTERRUPTIBLE;
-			schedule_timeout(info->close_delay);
+			msleep_interruptible(jiffies_to_msecs(info->close_delay));
 		}
 		wake_up_interruptible(&info->open_wait);
 	}

@@ -1313,8 +1313,7 @@ mcfrs_wait_until_sent(struct tty_struct 
 			fifo_cnt++;
 		if (fifo_cnt == 0)
 			break;
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(char_time);
+		msleep_interruptible(jiffies_to_msecs(char_time));
 		if (signal_pending(current))
 			break;
 		if (timeout && time_after(jiffies, orig_jiffies + timeout))
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     [email protected]
SnapGear -- a CyberGuard Company            PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#3 lore raw

[Kernel-janitors] Re: [PATCH 2.6.9-rc2 4/9] usb/file_storage:

In reply to Nishanth Aravamudan
Quoted 16 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() so that the task delays as expected.

drivers/usb/gadget/file_storage.c +1 -0
@@ -217,6 +217,7 @@
 #include <linux/compiler.h>
 #include <linux/completion.h>
 #include <linux/dcache.h>
+#include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/fcntl.h>
 #include <linux/file.h>

drivers/usb/gadget/file_storage.c static int halt_bulk_in_endpoint(struct · line 2287

Quoted 9 lines
drivers/usb/gadget/file_storage.c +1 -2
@@ -2280,8 +2281,7 @@ static int halt_bulk_in_endpoint(struct 
 		}
 
 		/* Wait for a short time and then try again */
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (schedule_timeout(HZ / 10) != 0)
+		if (msleep_interruptible(100) != 0)
 			return -EINTR;
 		rc = usb_ep_set_halt(fsg->bulk_in);
 	}

This change is okay. Greg, you have my approval to apply it.

Alan Stern

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Applied
#4 lore raw

[Kernel-janitors] Re: [PATCH 2.6.9-rc2 4/4] pci hotplug/shpchp:

In reply to Nishanth Aravamudan
Quoted 6 lines · Nishanth Aravamudan

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected.

Signed-off-by Nishanth Aravamudan <[email protected]>

Applied, thanks.

greg k-h

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors