2006-10-11 12:39:37

by Amol Lad

[permalink] [raw]
Subject: [PATCH 1/2] drivers/cdrom/cdu31a.c: Replacing yield() with a better alternative

In 2.6, the semantics of calling yield() changed from "sleep for a
bit" to "I really don't want to run for a while". This matches POSIX
better, but there's a lot of drivers still using yield() when they mean
cond_resched(), schedule() or even schedule_timeout().

For this driver schedule_timeout_interruptible() seems to be a better
alternative

Tested compile only

Signed-off-by: Amol Lad <[email protected]>
---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdiff linux-2.6.19-rc1-orig/drivers/cdrom/cdu31a.c linux-2.6.19-rc1/drivers/cdrom/cdu31a.c
--- linux-2.6.19-rc1-orig/drivers/cdrom/cdu31a.c 2006-10-05 14:00:42.000000000 +0530
+++ linux-2.6.19-rc1/drivers/cdrom/cdu31a.c 2006-10-11 17:28:42.000000000 +0530
@@ -370,7 +370,7 @@ static inline void disable_interrupts(vo
static inline void sony_sleep(void)
{
if (cdu31a_irq <= 0) {
- yield();
+ schedule_timeout_interruptible(1);
} else { /* Interrupt driven */
DEFINE_WAIT(w);
int first = 1;