Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (w83627ehf) Now only one intrusion channel

The 2nd intrusion channel was only used on the nct6776

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Link: https://lore.kernel.org/r/20191225023225.2785-4-linux@treblig.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Dr. David Alan Gilbert and committed by
Guenter Roeck
931f397b 69595502

+6 -13
+6 -13
drivers/hwmon/w83627ehf.c
··· 1091 1091 clear_caseopen(struct device *dev, struct w83627ehf_data *data, int channel, 1092 1092 long val) 1093 1093 { 1094 - u16 masks[] = { 0x80, 0x40 }; 1095 - u16 reg, mask; 1094 + const u16 mask = 0x80; 1095 + u16 reg; 1096 1096 1097 - if (val != 0 || channel > 1) 1097 + if (val != 0 || channel != 0) 1098 1098 return -EINVAL; 1099 - 1100 - mask = masks[channel]; 1101 1099 1102 1100 mutex_lock(&data->update_lock); 1103 1101 reg = w83627ehf_read_value(data, W83627EHF_REG_CASEOPEN_CLR); ··· 1416 1418 break; 1417 1419 1418 1420 case hwmon_intrusion: 1419 - if (channel == 0) 1420 - return 0644; 1421 - return 0; 1421 + return 0644; 1422 1422 1423 1423 default: /* Shouldn't happen */ 1424 1424 return 0; ··· 1541 1545 w83627ehf_do_read_intrusion(struct w83627ehf_data *data, u32 attr, 1542 1546 int channel, long *val) 1543 1547 { 1544 - unsigned int masks[] = { 0x10, 0x40 }; 1545 - 1546 - if (attr != hwmon_intrusion_alarm || channel > 1) 1548 + if (attr != hwmon_intrusion_alarm || channel != 0) 1547 1549 return -EOPNOTSUPP; /* shouldn't happen */ 1548 1550 1549 - *val = !!(data->caseopen & masks[channel]); 1551 + *val = !!(data->caseopen & 0x10); 1550 1552 return 0; 1551 1553 } 1552 1554 ··· 1682 1688 HWMON_T_ALARM | HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_MAX | 1683 1689 HWMON_T_MAX_HYST | HWMON_T_OFFSET | HWMON_T_TYPE), 1684 1690 HWMON_CHANNEL_INFO(intrusion, 1685 - HWMON_INTRUSION_ALARM, 1686 1691 HWMON_INTRUSION_ALARM), 1687 1692 NULL 1688 1693 };