From: domen@coderock.org
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, isdn4linux@listserv.isdn4linux.de,
domen@coderock.org, nacc@us.ibm.com
Subject: [patch 2/8] isdn/capi: replace interruptible_sleep_on() with wait_event_interruptible()
Date: Sun, 06 Mar 2005 23:38:02 +0100 [thread overview]
Message-ID: <20050306223803.77C4F1EC90@trashy.coderock.org> (raw)
Use wait_event_interruptible() instead of the deprecated
interruptible_sleep_on(). Patch is straight-forward as current sleep is
conditionally looped. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/drivers/isdn/capi/capi.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff -puN drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi drivers/isdn/capi/capi.c
--- kj/drivers/isdn/capi/capi.c~int_sleep_on-drivers_isdn_capi_capi 2005-03-05 16:11:36.000000000 +0100
+++ kj-domen/drivers/isdn/capi/capi.c 2005-03-05 16:11:36.000000000 +0100
@@ -675,13 +675,8 @@ capi_read(struct file *file, char __user
if (file->f_flags & O_NONBLOCK)
return -EAGAIN;
- for (;;) {
- interruptible_sleep_on(&cdev->recvwait);
- if ((skb = skb_dequeue(&cdev->recvqueue)) != 0)
- break;
- if (signal_pending(current))
- break;
- }
+ wait_event_interruptible(cdev->recvwait,
+ ((skb = skb_dequeue(&cdev->recvqueue)) == 0));
if (skb == 0)
return -ERESTARTNOHAND;
}
_
next reply other threads:[~2005-03-06 23:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-06 22:38 domen [this message]
2005-03-07 3:47 ` [patch 2/8] isdn/capi: replace interruptible_sleep_on() with wait_event_interruptible() Andrew Morton
2005-03-07 8:35 ` Domen Puncer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050306223803.77C4F1EC90@trashy.coderock.org \
--to=domen@coderock.org \
--cc=akpm@osdl.org \
--cc=isdn4linux@listserv.isdn4linux.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nacc@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox