From b75a806389901efa93c355238f787d922ba074b3 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 18 Sep 2018 11:18:30 -0700 Subject: [PATCH] hwmon: (nct6775) Separate fan/pwm configuration detection for NCT6795D Separate fan/pwm configuration detection for NCT6795D into separate case statement to make the code easier to read. No functional change. Signed-off-by: Guenter Roeck --- drivers/hwmon/nct6775.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 556b4cf..d9c2b93 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -3542,6 +3542,19 @@ nct6775_check_fan_inputs(struct nct6775_data *data) pwm6pin |= creb & BIT(2); break; case nct6795: + fan5pin |= cr1b & BIT(5); + fan5pin |= creb & BIT(5); + + fan6pin = (cr2a & BIT(4)) && + (!dsw_en || (cred & BIT(4))); + fan6pin |= creb & BIT(3); + + pwm5pin |= cr2d & BIT(7); + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0)); + + pwm6pin = (cr2a & BIT(3)) && (cred & BIT(2)); + pwm6pin |= creb & BIT(2); + break; case nct6796: pwm5pin |= cr2d & BIT(7); fan5pin |= cr1b & BIT(5); @@ -3561,10 +3574,8 @@ nct6775_check_fan_inputs(struct nct6775_data *data) (!dsw_en || (cred & BIT(4))); pwm6pin |= (cr2a & BIT(3)) && (cred & BIT(2)); - if (data->kind == nct6796) { - fan7pin = !(cr2b & BIT(2)); - pwm7pin = !(cr1d & (BIT(2) | BIT(3))); - } + fan7pin = !(cr2b & BIT(2)); + pwm7pin = !(cr1d & (BIT(2) | BIT(3))); break; default: /* NCT6779D */ -- 2.7.4