lkml.org 
[lkml]   [2007]   [Dec]   [24]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateMon, 24 Dec 2007 15:25:47 +0100 (CET)
FromJulia Lawall <>
Subject[PATCH 11/38] drivers/char/drm: Use time_before, time_before_eq, etc.
From: Julia Lawall <julia@diku.dk>

The functions time_before, time_before_eq, time_after, and time_after_eq
are more robust for comparing jiffies against other values.

A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@ change_compare_np @
expression E;
@@

(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)

@ include depends on change_compare_np @
@@

#include <linux/jiffies.h>

@ no_include depends on !include && change_compare_np @
@@

  #include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
---
diff -r -u -p a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c
--- a/drivers/char/drm/i830_irq.c	2007-10-22 11:25:05.000000000 +0200
+++ b/drivers/char/drm/i830_irq.c	2007-12-23 20:30:39.000000000 +0100
@@ -90,7 +90,7 @@ static int i830_wait_irq(struct drm_devi
 		__set_current_state(TASK_INTERRUPTIBLE);
 		if (atomic_read(&dev_priv->irq_received) >= irq_nr)
 			break;
-		if ((signed)(end - jiffies) <= 0) {
+		if (time_before_eq(jiffies, end)) {
 			DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
 				  I830_READ16(I830REG_INT_IDENTITY_R),
 				  I830_READ16(I830REG_INT_MASK_R),

\
 
 \ /
  Last update: 2007-12-24 15:29    [from the cache]
©2003-2008