diff --git a/kernel/chips/w83627hf.c b/kernel/chips/w83627hf.c index fde6fd72..7e533b03 100644 --- a/kernel/chips/w83627hf.c +++ b/kernel/chips/w83627hf.c @@ -853,7 +853,7 @@ static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value) static void w83627hf_init_client(struct i2c_client *client) { struct w83627hf_data *data = client->data; - int vid = 0, i; + int i; int type = data->type; u8 tmp; @@ -897,9 +897,6 @@ static void w83627hf_init_client(struct i2c_client *client) /* Choose VRM based on "VRM & OVT" register */ data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82; - if (type != w83697hf) - vid = vid_from_reg(vid, data->vrm); - tmp = w83627hf_read_value(client, W83781D_REG_SCFG1); for (i = 1; i <= 3; i++) { if (!(tmp & BIT_SCFG1[i - 1])) { diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index bdaf48f6..8b3d0de4 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -1264,7 +1264,7 @@ static int w83781d_write_value(struct i2c_client *client, u16 reg, u16 value) static void w83781d_init_client(struct i2c_client *client) { struct w83781d_data *data = client->data; - int vid = 0, i, p; + int i, p; int type = data->type; u8 tmp; @@ -1286,17 +1286,7 @@ static void w83781d_init_client(struct i2c_client *client) 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; - if (type == w83791d) { - data->vrm = 90; - } else { - data->vrm = DEFAULT_VRM; - } - vid = vid_from_reg(vid, data->vrm); - } + data->vrm = (type == w83791d) ? 90 : 82; if ((type != w83781d) && (type != as99127f)) { tmp = w83781d_read_value(client, W83781D_REG_SCFG1);