hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c-algo-pca: Rework waiting for a free bus 

Waiting for a free bus now accepts the timeout value in jiffies and does
proper checking using time_before.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Wolfram Sang 2009-03-28 21:34:45 +01:00 committed by Jean Delvare
parent eff9ec95ef
commit 8e99ada8de
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/boards/board-sh7785lcr.c
View File

@ -229,7 +229,7 @@ static struct resource i2c_resources[] = {
static struct i2c_pca9564_pf_platform_data i2c_platform_data = { static struct i2c_pca9564_pf_platform_data i2c_platform_data = {
.gpio = 0, .gpio = 0,
.i2c_clock_speed = I2C_PCA_CON_330kHz, .i2c_clock_speed = I2C_PCA_CON_330kHz,
.timeout = 100, .timeout = HZ,
}; };
static struct platform_device i2c_device = { static struct platform_device i2c_device = {

17
drivers/i2c/algos/i2c-algo-pca.c
View File

@ -22,6 +22,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/jiffies.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -186,14 +187,16 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
int numbytes = 0; int numbytes = 0;
int state; int state;
int ret; int ret;
int timeout = i2c_adap->timeout; unsigned long timeout = jiffies + i2c_adap->timeout;
while ((state = pca_status(adap)) != 0xf8 && timeout--) { while (pca_status(adap) != 0xf8) {
msleep(10); if (time_before(jiffies, timeout)) {
} msleep(10);
if (state != 0xf8) { } else {
dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state); dev_dbg(&i2c_adap->dev, "bus is not idle. status is "
return -EAGAIN; "%#04x\n", state);
return -EAGAIN;
}
} }
DEB1("{{{ XFER %d messages\n", num); DEB1("{{{ XFER %d messages\n", num);

2
drivers/i2c/busses/i2c-pca-isa.c
View File

@ -104,7 +104,7 @@ static struct i2c_adapter pca_isa_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.algo_data = &pca_isa_data, .algo_data = &pca_isa_data,
.name = "PCA9564/PCA9665 ISA Adapter", .name = "PCA9564/PCA9665 ISA Adapter",
.timeout = 100, .timeout = HZ,
}; };
static int __devinit pca_isa_match(struct device *dev, unsigned int id) static int __devinit pca_isa_match(struct device *dev, unsigned int id)

2
include/linux/i2c-pca-platform.h
View File

@ -6,7 +6,7 @@ struct i2c_pca9564_pf_platform_data {
* not supplied (negative value), but it * not supplied (negative value), but it
* cannot exit some error conditions then */ * cannot exit some error conditions then */
int i2c_clock_speed; /* values are defined in linux/i2c-algo-pca.h */ int i2c_clock_speed; /* values are defined in linux/i2c-algo-pca.h */
int timeout; /* timeout = this value * 10us */ int timeout; /* timeout in jiffies */
}; };
#endif /* I2C_PCA9564_PLATFORM_H */ #endif /* I2C_PCA9564_PLATFORM_H */