ChangeSet 1.1826, 2004/06/22 09:25:34-07:00, khali@linux-fr.org
[PATCH] I2C: Drop out-of-date code in w83781d and w83627hf
Here is a simple patch which drops some out-of-date code in the w83781d
and w83627hf i2c chip drivers. These bits are left over from the times
when chip drivers were setting default limits at init.
Signed-off-by: Jean Delvare <khali at linux-fr dot org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/i2c/chips/w83627hf.c | 5 +----
drivers/i2c/chips/w83781d.c | 11 ++---------
2 files changed, 3 insertions(+), 13 deletions(-)
diff -Nru a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c
--- a/drivers/i2c/chips/w83627hf.c Tue Jun 22 09:46:17 2004
+++ b/drivers/i2c/chips/w83627hf.c Tue Jun 22 09:46:17 2004
@@ -1240,7 +1240,7 @@
static void w83627hf_init_client(struct i2c_client *client)
{
struct w83627hf_data *data = i2c_get_clientdata(client);
- int vid = 0, i;
+ int i;
int type = data->type;
u8 tmp;
@@ -1283,9 +1283,6 @@
/* Convert VID to voltage based on default VRM */
data->vrm = DEFAULT_VRM;
}
-
- if (type != w83697hf)
- vid = vid_from_reg(vid, data->vrm);
tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
for (i = 1; i <= 3; i++) {
diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c
--- a/drivers/i2c/chips/w83781d.c Tue Jun 22 09:46:17 2004
+++ b/drivers/i2c/chips/w83781d.c Tue Jun 22 09:46:17 2004
@@ -1491,7 +1491,7 @@
w83781d_init_client(struct i2c_client *client)
{
struct w83781d_data *data = i2c_get_clientdata(client);
- int vid = 0, i, p;
+ int i, p;
int type = data->type;
u8 tmp;
@@ -1513,14 +1513,7 @@
w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
}
- if (type != w83697hf) {
- vid = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0x0f;
- vid |=
- (w83781d_read_value(client, W83781D_REG_CHIPID) & 0x01) <<
- 4;
- data->vrm = DEFAULT_VRM;
- vid = vid_from_reg(vid, data->vrm);
- }
+ data->vrm = 82;
if ((type != w83781d) && (type != as99127f)) {
tmp = w83781d_read_value(client, W83781D_REG_SCFG1);