ChangeSet 1.2065.3.39, 2005/03/12 08:31:12-08:00, [EMAIL PROTECTED]
[PATCH] media/zoran_card: remove interruptible_sleep_on_timeout() usage
Remove deprecated interruptible_sleep_on_timeout() function calls and
replace
with direct wait-queue usage. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
Signed-off-by: Domen Puncer <[EMAIL PROTECTED]>
Signed-off-by: Gerd Knorr <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
zoran_card.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
diff -Nru a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
--- a/drivers/media/video/zoran_card.c 2005-03-12 21:32:54 -08:00
+++ b/drivers/media/video/zoran_card.c 2005-03-12 21:32:54 -08:00
@@ -41,6 +41,7 @@
#include <linux/spinlock.h>
#include <linux/sem.h>
#include <linux/kmod.h>
+#include <linux/wait.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
@@ -968,6 +969,7 @@
static void __devinit
test_interrupts (struct zoran *zr)
{
+ DEFINE_WAIT(wait);
int timeout, icr;
clear_interrupt_counters(zr);
@@ -975,7 +977,9 @@
zr->testing = 1;
icr = btread(ZR36057_ICR);
btwrite(0x78000000 | ZR36057_ICR_IntPinEn, ZR36057_ICR);
- timeout = interruptible_sleep_on_timeout(&zr->test_q, 1 * HZ);
+ prepare_to_wait(&zr->test_q, &wait, TASK_INTERRUPTIBLE);
+ timeout = schedule_timeout(HZ);
+ finish_wait(&zr->test_q, &wait);
btwrite(0, ZR36057_ICR);
btwrite(0x78000000, ZR36057_ISR);
zr->testing = 0;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
