Messages in this thread Patch in this message | | | Subject | [PATCH] i2c/i2c-elektor: remove interruptible_sleep_on_timeout() usage | Date | Thu, 31 Mar 2005 15:23:09 -0800 | From | Greg KH <> |
| |
ChangeSet 1.2323, 2005/03/31 14:05:31-08:00, domen@coderock.org
[PATCH] i2c/i2c-elektor: remove interruptible_sleep_on_timeout() usage
Replace deprecated interruptible_sleep_on_timeout() with direct wait-queue usage. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/i2c/busses/i2c-elektor.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c --- a/drivers/i2c/busses/i2c-elektor.c 2005-03-31 15:19:14 -08:00 +++ b/drivers/i2c/busses/i2c-elektor.c 2005-03-31 15:19:14 -08:00 @@ -110,7 +110,7 @@ } static void pcf_isa_waitforpin(void) { - + DEFINE_WAIT(wait); int timeout = 2; long flags; @@ -118,14 +118,15 @@ 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); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |