<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From khali@linux-fr.org Wed Jul 27 12:28:48 2005
Date: Wed, 27 Jul 2005 21:27:26 +0200
From: Jean Delvare &lt;khali@linux-fr.org&gt;
To: Greg KH &lt;greg@kroah.com&gt;
Cc: Marcelo Feitoza Parisi &lt;marcelo@feitoza.com.br&gt;
Subject: I2C: use time_after in 3 chip drivers
Message-Id: &lt;20050727212726.5d8037e2.khali@linux-fr.org&gt;


A few i2c drivers were not updated to use time_after() yet.

Signed-off-by: Marcelo Feitoza Parisi &lt;marcelo@feitoza.com.br&gt;
Signed-off-by: Jean Delvare &lt;khali@linux-fr.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;


---
 drivers/hwmon/atxp1.c   |    5 ++---
 drivers/hwmon/fscpos.c  |    4 ++--
 drivers/hwmon/gl520sm.c |    4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

--- gregkh-2.6.orig/drivers/hwmon/atxp1.c	2005-07-27 23:18:12.000000000 -0700
+++ gregkh-2.6/drivers/hwmon/atxp1.c	2005-07-27 23:20:20.000000000 -0700
@@ -21,6 +21,7 @@
 #include &lt;linux/kernel.h&gt;
 #include &lt;linux/init.h&gt;
 #include &lt;linux/module.h&gt;
+#include &lt;linux/jiffies.h&gt;
 #include &lt;linux/i2c.h&gt;
 #include &lt;linux/i2c-sensor.h&gt;
 #include &lt;linux/i2c-vid.h&gt;
@@ -80,9 +81,7 @@
 
 	down(&amp;data-&gt;update_lock);
 
-	if ((jiffies - data-&gt;last_updated &gt; HZ) ||
-	    (jiffies &lt; data-&gt;last_updated) ||
-	    !data-&gt;valid) {
+	if (time_after(jiffies, data-&gt;last_updated + HZ) || !data-&gt;valid) {
 
 		/* Update local register data */
 		data-&gt;reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID);
--- gregkh-2.6.orig/drivers/hwmon/fscpos.c	2005-07-27 23:18:12.000000000 -0700
+++ gregkh-2.6/drivers/hwmon/fscpos.c	2005-07-27 23:20:20.000000000 -0700
@@ -32,6 +32,7 @@
 
 #include &lt;linux/module.h&gt;
 #include &lt;linux/slab.h&gt;
+#include &lt;linux/jiffies.h&gt;
 #include &lt;linux/i2c.h&gt;
 #include &lt;linux/i2c-sensor.h&gt;
 #include &lt;linux/init.h&gt;
@@ -572,8 +573,7 @@
 
 	down(&amp;data-&gt;update_lock);
 
-	if ((jiffies - data-&gt;last_updated &gt; 2 * HZ) ||
-			(jiffies &lt; data-&gt;last_updated) || !data-&gt;valid) {
+	if (time_after(jiffies, data-&gt;last_updated + 2 * HZ) || !data-&gt;valid) {
 		int i;
 
 		dev_dbg(&amp;client-&gt;dev, "Starting fscpos update\n");
--- gregkh-2.6.orig/drivers/hwmon/gl520sm.c	2005-07-27 23:18:12.000000000 -0700
+++ gregkh-2.6/drivers/hwmon/gl520sm.c	2005-07-27 23:20:20.000000000 -0700
@@ -24,6 +24,7 @@
 #include &lt;linux/module.h&gt;
 #include &lt;linux/init.h&gt;
 #include &lt;linux/slab.h&gt;
+#include &lt;linux/jiffies.h&gt;
 #include &lt;linux/i2c.h&gt;
 #include &lt;linux/i2c-sensor.h&gt;
 #include &lt;linux/i2c-vid.h&gt;
@@ -678,8 +679,7 @@
 
 	down(&amp;data-&gt;update_lock);
 
-	if ((jiffies - data-&gt;last_updated &gt; 2 * HZ) ||
-	    (jiffies &lt; data-&gt;last_updated) || !data-&gt;valid) {
+	if (time_after(jiffies, data-&gt;last_updated + 2 * HZ) || !data-&gt;valid) {
 
 		dev_dbg(&amp;client-&gt;dev, "Starting gl520sm update\n");
 
</pre></body></html>