From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH] drm/drm_os_linux: use
Date: Wed, 02 Mar 2005 20:33:13 +0000 [thread overview]
Message-ID: <20050302203313.GL2741@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
Hi,
Please consider applying.
Description: Rather than use custom code in DRM_WAIT_ON() to do exactly
what wait_event_interruptible_timeout() does, use the function and just
change the return values appropriately.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.11-kj-v/drivers/char/drm/drm_os_linux.h 2005-03-01 23:38:26.000000000 -0800
+++ 2.6.11-kj/drivers/char/drm/drm_os_linux.h 2005-03-02 12:30:45.000000000 -0800
@@ -6,6 +6,7 @@
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
+#include <linux/wait.h>
/** File pointer type */
#define DRMFILE struct file *
@@ -121,26 +122,12 @@ do { \
#define DRM_WAIT_ON( ret, queue, timeout, condition ) \
do { \
- DECLARE_WAITQUEUE(entry, current); \
- unsigned long end = jiffies + (timeout); \
- add_wait_queue(&(queue), &entry); \
- \
- for (;;) { \
- __set_current_state(TASK_INTERRUPTIBLE); \
- if (condition) \
- break; \
- if (time_after_eq(jiffies, end)) { \
- ret = -EBUSY; \
- break; \
- } \
- schedule_timeout((HZ/100 > 1) ? HZ/100 : 1); \
- if (signal_pending(current)) { \
- ret = -EINTR; \
- break; \
- } \
- } \
- __set_current_state(TASK_RUNNING); \
- remove_wait_queue(&(queue), &entry); \
+ long __ret; \
+ __ret = wait_event_interruptible_timeout(queue, condition, timeout); \
+ if (__ret == 0) \
+ ret = -EBUSY; \
+ else if (__ret == -ERESTARTSYS) \
+ ret = -EINTR; \
} while (0)
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
reply other threads:[~2005-03-02 20:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20050302203313.GL2741@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=kernel-janitors@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.