aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-09-05 10:46:55 +0300
committerGuenter Roeck <linux@roeck-us.net>2018-10-10 20:37:13 -0700
commitc3bf6076cc41659c7b0301d19f871a22e4633013 (patch)
treeb01178a0cfbf090716f8f441e3c802b9ca1e9509 /drivers/hwmon
parenthwmon: (k10temp) Support all Family 15h Model 6xh and Model 7xh processors (diff)
downloadlinux-dev-c3bf6076cc41659c7b0301d19f871a22e4633013.tar.xz
linux-dev-c3bf6076cc41659c7b0301d19f871a22e4633013.zip
hwmon: (nct6775) Clean up a condition
I removed the "dsw_en &&" chunk of the condition because we know that "dsw_en" is set. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/nct6775.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 78603b78cf41..2b493d0682af 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -3550,8 +3550,7 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
if (!fan6pin)
fan6pin = (regval_2a & BIT(4)) &&
- (!dsw_en ||
- (dsw_en && (regval_ed & BIT(4))));
+ (!dsw_en || (regval_ed & BIT(4)));
if (!pwm6pin)
pwm6pin = (regval_2a & BIT(3)) &&
(regval_ed & BIT(2));