diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2006-06-12 15:40:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-22 14:10:34 -0400 |
commit | 1ded969fb97fba33e7310ef95f0b3e3123d4d92a (patch) | |
tree | 660ed1ca5eee779d8e03aae97324d318b2a1fa45 /drivers/i2c | |
parent | b7c066044f4355d9fbe1ac45e03303b78d21e8d4 (diff) |
[PATCH] i2c-ocores: Minor cleanups
Minor cleanup to the i2c-ocores driver.
Peter Korsgaard will maintain the i2c-ocores driver.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-ocores.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index d5c0610bfe6d..592824087c49 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c | |||
@@ -38,8 +38,8 @@ struct ocores_i2c { | |||
38 | #define OCI2C_PREHIGH 1 | 38 | #define OCI2C_PREHIGH 1 |
39 | #define OCI2C_CONTROL 2 | 39 | #define OCI2C_CONTROL 2 |
40 | #define OCI2C_DATA 3 | 40 | #define OCI2C_DATA 3 |
41 | #define OCI2C_CMD 4 | 41 | #define OCI2C_CMD 4 /* write only */ |
42 | #define OCI2C_STATUS 4 | 42 | #define OCI2C_STATUS 4 /* read only, same address as OCI2C_CMD */ |
43 | 43 | ||
44 | #define OCI2C_CTRL_IEN 0x40 | 44 | #define OCI2C_CTRL_IEN 0x40 |
45 | #define OCI2C_CTRL_EN 0x80 | 45 | #define OCI2C_CTRL_EN 0x80 |
@@ -209,8 +209,6 @@ static struct i2c_adapter ocores_adapter = { | |||
209 | .name = "i2c-ocores", | 209 | .name = "i2c-ocores", |
210 | .class = I2C_CLASS_HWMON, | 210 | .class = I2C_CLASS_HWMON, |
211 | .algo = &ocores_algorithm, | 211 | .algo = &ocores_algorithm, |
212 | .timeout = 2, | ||
213 | .retries = 1, | ||
214 | }; | 212 | }; |
215 | 213 | ||
216 | 214 | ||