Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cacdf29 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

[PATCH] I2C: use time_after in 3 chip drivers 



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

Signed-off-by: default avatarMarcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 368609c5

drivers/hwmon/atxp1.c

+2 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/jiffies.h>

#include <linux/i2c.h>

#include <linux/i2c-sensor.h>

#include <linux/i2c-vid.h>
@@ -80,9 +81,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev) 


	down(&data->update_lock);



	if ((jiffies - data->last_updated > HZ) ||

	    (jiffies < data->last_updated) ||

	    !data->valid) {

	if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {



		/* Update local register data */

		data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID);

drivers/hwmon/fscpos.c

+2 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <linux/module.h>

#include <linux/slab.h>

#include <linux/jiffies.h>

#include <linux/i2c.h>

#include <linux/i2c-sensor.h>

#include <linux/init.h>
@@ -572,8 +573,7 @@ static struct fscpos_data *fscpos_update_device(struct device *dev) 


	down(&data->update_lock);



	if ((jiffies - data->last_updated > 2 * HZ) ||

			(jiffies < data->last_updated) || !data->valid) {

	if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {

		int i;



		dev_dbg(&client->dev, "Starting fscpos update\n");

drivers/hwmon/gl520sm.c

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/jiffies.h>

#include <linux/i2c.h>

#include <linux/i2c-sensor.h>

#include <linux/i2c-vid.h>
@@ -678,8 +679,7 @@ static struct gl520_data *gl520_update_device(struct device *dev) 


	down(&data->update_lock);



	if ((jiffies - data->last_updated > 2 * HZ) ||

	    (jiffies < data->last_updated) || !data->valid) {

	if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) {



		dev_dbg(&client->dev, "Starting gl520sm update\n");