diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-07-29 15:15:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 16:12:50 -0400 |
commit | 0cacdf298211ec9e87354cf102f20d070e76e075 (patch) | |
tree | e1bf80422b3508d689210db3b0e1f3bbf075e2ec | |
parent | 368609c5a8bd75b77721e69726ddfd3c6a30f7d4 (diff) |
[PATCH] I2C: use time_after in 3 chip drivers
A few i2c drivers were not updated to use time_after() yet.
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/hwmon/atxp1.c | 5 | ||||
-rw-r--r-- | drivers/hwmon/fscpos.c | 4 | ||||
-rw-r--r-- | drivers/hwmon/gl520sm.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c index 0bcf82b4c07b..fca3fc1cef72 100644 --- a/drivers/hwmon/atxp1.c +++ b/drivers/hwmon/atxp1.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/jiffies.h> | ||
24 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
25 | #include <linux/i2c-sensor.h> | 26 | #include <linux/i2c-sensor.h> |
26 | #include <linux/i2c-vid.h> | 27 | #include <linux/i2c-vid.h> |
@@ -80,9 +81,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev) | |||
80 | 81 | ||
81 | down(&data->update_lock); | 82 | down(&data->update_lock); |
82 | 83 | ||
83 | if ((jiffies - data->last_updated > HZ) || | 84 | if (time_after(jiffies, data->last_updated + HZ) || !data->valid) { |
84 | (jiffies < data->last_updated) || | ||
85 | !data->valid) { | ||
86 | 85 | ||
87 | /* Update local register data */ | 86 | /* Update local register data */ |
88 | data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID); | 87 | data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID); |
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c index 3beaa6191ef4..270015b626ad 100644 --- a/drivers/hwmon/fscpos.c +++ b/drivers/hwmon/fscpos.c | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/jiffies.h> | ||
35 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
36 | #include <linux/i2c-sensor.h> | 37 | #include <linux/i2c-sensor.h> |
37 | #include <linux/init.h> | 38 | #include <linux/init.h> |
@@ -572,8 +573,7 @@ static struct fscpos_data *fscpos_update_device(struct device *dev) | |||
572 | 573 | ||
573 | down(&data->update_lock); | 574 | down(&data->update_lock); |
574 | 575 | ||
575 | if ((jiffies - data->last_updated > 2 * HZ) || | 576 | if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) { |
576 | (jiffies < data->last_updated) || !data->valid) { | ||
577 | int i; | 577 | int i; |
578 | 578 | ||
579 | dev_dbg(&client->dev, "Starting fscpos update\n"); | 579 | dev_dbg(&client->dev, "Starting fscpos update\n"); |
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c index a13a504f5bfa..80ae8d30c2af 100644 --- a/drivers/hwmon/gl520sm.c +++ b/drivers/hwmon/gl520sm.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/jiffies.h> | ||
27 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
28 | #include <linux/i2c-sensor.h> | 29 | #include <linux/i2c-sensor.h> |
29 | #include <linux/i2c-vid.h> | 30 | #include <linux/i2c-vid.h> |
@@ -678,8 +679,7 @@ static struct gl520_data *gl520_update_device(struct device *dev) | |||
678 | 679 | ||
679 | down(&data->update_lock); | 680 | down(&data->update_lock); |
680 | 681 | ||
681 | if ((jiffies - data->last_updated > 2 * HZ) || | 682 | if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) { |
682 | (jiffies < data->last_updated) || !data->valid) { | ||
683 | 683 | ||
684 | dev_dbg(&client->dev, "Starting gl520sm update\n"); | 684 | dev_dbg(&client->dev, "Starting gl520sm update\n"); |
685 | 685 | ||