Commit a4e0a080 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (nct6775) Use logical or instead of if statements where possible

Use
	boolean |= <expression>;
instead of
	if (!boolean)
		boolean = <expression>;
to assign values to boolean variables.

No functional change.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 2d888c5f
...@@ -3529,36 +3529,24 @@ nct6775_check_fan_inputs(struct nct6775_data *data) ...@@ -3529,36 +3529,24 @@ nct6775_check_fan_inputs(struct nct6775_data *data)
case nct6793: case nct6793:
case nct6795: case nct6795:
case nct6796: case nct6796:
if (!pwm5pin) pwm5pin |= cr2d & BIT(7);
pwm5pin = cr2d & BIT(7);
if (!fan5pin) fan5pin |= cr1b & BIT(5);
fan5pin = cr1b & BIT(5);
if (data->kind != nct6796) { if (data->kind != nct6796) {
if (!dsw_en) { fan6pin = !dsw_en && (cr2d & BIT(1));
fan6pin = cr2d & BIT(1); pwm6pin = !dsw_en && (cr2d & BIT(0));
pwm6pin = cr2d & BIT(0);
}
if (!fan5pin) fan5pin |= creb & BIT(5);
fan5pin = creb & BIT(5); pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0));
if (!pwm5pin) fan6pin |= creb & BIT(3);
pwm5pin = (creb & BIT(4)) && pwm6pin |= creb & BIT(2);
!(cr2a & BIT(0));
if (!fan6pin)
fan6pin = creb & BIT(3);
if (!pwm6pin)
pwm6pin = creb & BIT(2);
} }
if (data->kind == nct6795 || data->kind == nct6796) { if (data->kind == nct6795 || data->kind == nct6796) {
if (!fan6pin) fan6pin |= (cr2a & BIT(4)) &&
fan6pin = (cr2a & BIT(4)) &&
(!dsw_en || (cred & BIT(4))); (!dsw_en || (cred & BIT(4)));
if (!pwm6pin) pwm6pin |= (cr2a & BIT(3)) && (cred & BIT(2));
pwm6pin = (cr2a & BIT(3)) &&
(cred & BIT(2));
} }
if (data->kind == nct6796) { if (data->kind == nct6796) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment