Skip to contentSkip to conversation

char/ite_gpio: remove

PATCH New Nishanth Aravamudan 1 participant 1 message Feb 2, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/20 char/ite_gpio: remove

Hello,

Please consider applying.

Description: Replace deprecated interruptible_sleep_on_timeout() function calls with direct wait-queue usage. Patch is compile-tested, in a sense; it introduces no warnings (driver is currently broken).

drivers/char/ite_gpio.c +5 -1
@@ -43,6 +43,7 @@
 #include <asm/it8172/it8172_int.h>
 #include <linux/sched.h>
 #include <linux/ite_gpio.h>
+#include <linux/wait.h>
 
 #define ite_gpio_base 0x14013800
 
@@ -192,6 +193,7 @@ int ite_gpio_int_wait (__u32 device, __u
 {
 	int i,line=0, ret=0;
 	unsigned long flags;
+	DEFINE_WAIT(wait);
 
 	switch (device) {
 	case ITE_GPIO_PORTA:
@@ -221,7 +223,9 @@ int ite_gpio_int_wait (__u32 device, __u
 	save_flags (flags);
 	cli();
 	ite_gpio_irq_pending[i] = 1;
-	ret = interruptible_sleep_on_timeout(&ite_gpio_wait[i], 3*HZ);
+	prepare_to_wait(&ite_gpio_wait[i], &wait, TASK_INTERRUPTIBLE);
+	ret = schedule_timeout(3*HZ);
+	finish_wait(&ite_gpio_wait[i], &wait);
 	restore_flags (flags);
 	ite_gpio_irq_pending[i] = 0;
 

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