Hi Guenter,
On Fri, 27 Jan 2012 05:48:58 -0800, Guenter Roeck wrote:
> NCT6776F can select fan input pins for fans 3 to 5 with a secondary set of
> chip register bits. Check that second set of bits in addition to the first set
> to detect if fans 3..5 are monitored.
>
> Reported-by: C. Comren <ccomren@@gmail.com>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/hwmon/w83627ehf.c | 11 +++++++++++
> 1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
> index 0e0af04..c0ef1a3 100644
> --- a/drivers/hwmon/w83627ehf.c
> +++ b/drivers/hwmon/w83627ehf.c
> @@ -1914,9 +1914,20 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
> fan4min = 0;
> fan5pin = 0;
> } else if (sio_data->kind == nct6776) {
> + u8 val;
Please just use regval which is already declared.
> +
> fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
> fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
> fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
A blank line here would improve readability.
> + /* Test secondary set of fan input select registers */
> + superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
> + val = superio_inb(sio_data->sioreg, SIO_REG_ENABLE);
> + if (!fan3pin && (val & 0x80))
> + fan3pin = true;
> + if (!fan4pin && (val & 0x40))
> + fan4pin = true;
> + if (!fan5pin && (val & 0x20))
> + fan5pin = true;
I don't quite get the point of testing for !fan3pin, !fan4pin
and !fan5pin. This adds code without changing the result.
Also note that according to the NCT6776F datasheet, pins 90, 91 and 92
are GP73, GP72 and GP71 only if Super-I/O configuration register 0x27
bit 7 is set, which is not the default. I would assume that a BIOS
which takes care of setting the upper bits in configuration register
0x30 also takes care of setting bit 7 in configuration register 0x27,
but maybe the driver should still check for this.
And a blank line here would improve readability too.
> fan4min = fan4pin;
> } else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
> fan3pin = 1;
--
Jean Delvare
_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
