redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

hwmon: (nct6775) Declare and initialize LDN specific config variables earlier 

Declare and initialize LDN / chip specific configuration variables
earlier. This simplifies re-using the configuration variables for
multiple chips and makes the code easier to read.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
hifive-unleashed-5.1
Guenter Roeck 2018-09-18 09:49:29 -07:00
parent 97ce6df468
commit 2d888c5f22
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/hwmon/nct6775.c
View File

@ -3505,6 +3505,12 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
int cr2d = superio_inb(sioreg, 0x2d);
int cr2f = superio_inb(sioreg, 0x2f);
bool dsw_en = cr2f & BIT(3);
int creb;
int cred;
superio_select(sioreg, NCT6775_LD_12);
creb = superio_inb(sioreg, 0xeb);
cred = superio_inb(sioreg, 0xed);
fan3pin = !(cr1c & BIT(5));
fan4pin = !(cr1c & BIT(6));
@ -3529,10 +3535,7 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
if (!fan5pin)
fan5pin = cr1b & BIT(5);
superio_select(sioreg, NCT6775_LD_12);
if (data->kind != nct6796) {
int creb = superio_inb(sioreg, 0xeb);
if (!dsw_en) {
fan6pin = cr2d & BIT(1);
pwm6pin = cr2d & BIT(0);
@ -3550,8 +3553,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
}
if (data->kind == nct6795 || data->kind == nct6796) {
int cred = superio_inb(sioreg, 0xed);
if (!fan6pin)
fan6pin = (cr2a & BIT(4)) &&
(!dsw_en || (cred & BIT(4)));