login
Header Space

 
 

[PATCH 14/38] drivers/char/rtc.c: Use time_before, time_before_eq, etc.

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <a.zummo@...>, <linux-kernel@...>, <kernel-janitors@...>
Date: Monday, December 24, 2007 - 10:27 am

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/rtc.c b/drivers/char/rtc.c
--- a/drivers/char/rtc.c	2007-11-15 15:09:36.000000000 +0100
+++ b/drivers/char/rtc.c	2007-12-23 20:35:15.000000000 +0100
@@ -88,6 +88,7 @@
 
 #ifdef CONFIG_SPARC32
 #include <linux/pci.h>
+#include <linux/jiffies.h>
 #include <asm/ebus.h>
 
 static unsigned long rtc_port;
@@ -1282,7 +1283,8 @@ void rtc_get_rtc_time(struct rtc_time *r
 	 * Once the read clears, read the RTC time (again via ioctl). Easy.
 	 */
 
-	while (rtc_is_updating() != 0 && jiffies - uip_watchdog < 2*HZ/100)
+	while (rtc_is_updating() != 0 &&
+	       time_before(jiffies, uip_watchdog + 2*HZ/100))
 		cpu_relax();
 
 	/*
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 14/38] drivers/char/rtc.c: Use time_before, time_befo..., Julia Lawall, (Mon Dec 24, 10:27 am)
speck-geostationary