i2c/i2c-elektor: remove interruptible_sleep_on_timeout()

PATCH New [email protected] 1 participant 1 message May 19, 2005 I2C subsystem host drivers

lore

Share & tools

lore

[email protected]

author

2005-05-19 06:25 UTC #0 lore raw

PATCH 1/2 i2c/i2c-elektor: remove interruptible_sleep_on_timeout()

Replace deprecated interruptible_sleep_on_timeout() with direct wait-queue usage. Patch is compile-tested.

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

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/drivers/i2c/busses/i2c-elektor.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

drivers/i2c/busses/i2c-elektor.c renamed from drivers/i2c/busses/i2c-elektor.c~int_sleep_on-drivers_i2c_busses_i2c-elektor +4 -3

diff -puN drivers/i2c/busses/i2c-elektor.c~int_sleep_on-drivers_i2c_busses_i2c-elektor drivers/i2c/busses/i2c-elektor.c
@@ -110,7 +110,7 @@ static int pcf_isa_getclock(void *data)
 }
 
 static void pcf_isa_waitforpin(void) {
-
+	DEFINE_WAIT(wait);
 	int timeout = 2;
 	long flags;

@@ -118,14 +118,15 @@ static void pcf_isa_waitforpin(void) {
 		spin_lock_irqsave(&lock, flags);
 		if (pcf_pending = 0) {
 			spin_unlock_irqrestore(&lock, flags);
-			if (interruptible_sleep_on_timeout(&pcf_wait,
-								timeout*HZ)) {
+			prepare_to_wait(&pcf_wait, &wait, TASK_INTERRUPTIBLE);
+			if (schedule_timeout(timeout*HZ)) {
 				spin_lock_irqsave(&lock, flags);
 				if (pcf_pending = 1) {
 					pcf_pending = 0;
 				}
 				spin_unlock_irqrestore(&lock, flags);
 			}
+			finish_wait(&pcf_wait, &wait);
 		} else {
 			pcf_pending = 0;
 			spin_unlock_irqrestore(&lock, flags);