lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] I2C: use time_after in 3 chip drivers

Browse Source 
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>
This commit is contained in:
Jean Delvare
2005-07-29 12:15:12 -07:00
committed by Linus Torvalds
parent 368609c5a8
commit 0cacdf2982
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hwmon/atxp1.c
View File

@@ -21,6 +21,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
#include <linux/i2c-vid.h> #include <linux/i2c-vid.h>
@@ -80,9 +81,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev)
down(&data->update_lock); down(&data->update_lock);
if ((jiffies - data->last_updated > HZ) || if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
(jiffies < data->last_updated) ||
!data->valid) {
/* Update local register data */ /* Update local register data */
data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID); data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID);

4
drivers/hwmon/fscpos.c
View File

@@ -32,6 +32,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
#include <linux/init.h> #include <linux/init.h>
@@ -572,8 +573,7 @@ static struct fscpos_data *fscpos_update_device(struct device *dev)
down(&data->update_lock); down(&data->update_lock);
if ((jiffies - data->last_updated > 2 * HZ) || if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
(jiffies < data->last_updated) || !data->valid) {
int i; int i;
dev_dbg(&client->dev, "Starting fscpos update\n"); dev_dbg(&client->dev, "Starting fscpos update\n");

4
drivers/hwmon/gl520sm.c
View File

@@ -24,6 +24,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-sensor.h> #include <linux/i2c-sensor.h>
#include <linux/i2c-vid.h> #include <linux/i2c-vid.h>
@@ -678,8 +679,7 @@ static struct gl520_data *gl520_update_device(struct device *dev)
down(&data->update_lock); down(&data->update_lock);
if ((jiffies - data->last_updated > 2 * HZ) || if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {
(jiffies < data->last_updated) || !data->valid) {
dev_dbg(&client->dev, "Starting gl520sm update\n"); dev_dbg(&client->dev, "Starting gl520sm update\n");