git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-ali1535.c
diff --git
a/drivers/i2c/busses/i2c-ali1535.c
b/drivers/i2c/busses/i2c-ali1535.c
index
6715b0d
..
c0a85e2
100644
(file)
--- a/
drivers/i2c/busses/i2c-ali1535.c
+++ b/
drivers/i2c/busses/i2c-ali1535.c
@@
-59,6
+59,7
@@
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <linux/sched.h>
+#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/i2c.h>
#include <linux/init.h>
@@
-276,7
+277,7
@@
static int ali1535_transaction(struct i2c_adapter *adap)
/* We will always wait for a fraction of a second! */
timeout = 0;
do {
/* We will always wait for a fraction of a second! */
timeout = 0;
do {
-
i2c_delay
(1);
+
msleep
(1);
temp = inb_p(SMBHSTSTS);
} while (((temp & ALI1535_STS_BUSY) && !(temp & ALI1535_STS_IDLE))
&& (timeout++ < MAX_TIMEOUT));
temp = inb_p(SMBHSTSTS);
} while (((temp & ALI1535_STS_BUSY) && !(temp & ALI1535_STS_IDLE))
&& (timeout++ < MAX_TIMEOUT));
@@
-350,7
+351,7
@@
static s32 ali1535_access(struct i2c_adapter *adap, u16 addr,
for (timeout = 0;
(timeout < MAX_TIMEOUT) && !(temp & ALI1535_STS_IDLE);
timeout++) {
for (timeout = 0;
(timeout < MAX_TIMEOUT) && !(temp & ALI1535_STS_IDLE);
timeout++) {
-
i2c_delay
(1);
+
msleep
(1);
temp = inb_p(SMBHSTSTS);
}
if (timeout >= MAX_TIMEOUT)
temp = inb_p(SMBHSTSTS);
}
if (timeout >= MAX_TIMEOUT)
@@
-480,7
+481,7
@@
static struct i2c_algorithm smbus_algorithm = {
static struct i2c_adapter ali1535_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter ali1535_adapter = {
.owner = THIS_MODULE,
- .class = I2C_
ADAP_CLASS_SMBUS
,
+ .class = I2C_
CLASS_HWMON
,
.algo = &smbus_algorithm,
.name = "unset",
};
.algo = &smbus_algorithm,
.name = "unset",
};