diff options
| author | Dr. David Alan Gilbert <linux@treblig.org> | 2019-12-25 03:32:25 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2020-01-23 22:15:10 +0100 |
| commit | 931f397bc6243f2def1f2c147d415cfcd83a3df5 (patch) | |
| tree | e61bfc263ba798f41e9c23844ce04fd85ddb89be /drivers/hwmon/w83627ehf.c | |
| parent | hwmon: (w83627ehf) Remove code not needed after nct677* removal (diff) | |
| download | linux-931f397bc6243f2def1f2c147d415cfcd83a3df5.tar.xz linux-931f397bc6243f2def1f2c147d415cfcd83a3df5.zip | |
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>
Diffstat (limited to 'drivers/hwmon/w83627ehf.c')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index e13bec80af0b..5a7239eb1c15 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -1091,14 +1091,12 @@ static int clear_caseopen(struct device *dev, struct w83627ehf_data *data, int channel, long val) { - u16 masks[] = { 0x80, 0x40 }; - u16 reg, mask; + const u16 mask = 0x80; + u16 reg; - if (val != 0 || channel > 1) + if (val != 0 || channel != 0) return -EINVAL; - mask = masks[channel]; - mutex_lock(&data->update_lock); reg = w83627ehf_read_value(data, W83627EHF_REG_CASEOPEN_CLR); w83627ehf_write_value(data, W83627EHF_REG_CASEOPEN_CLR, reg | mask); @@ -1418,9 +1416,7 @@ w83627ehf_is_visible(const void *drvdata, enum hwmon_sensor_types type, break; case hwmon_intrusion: - if (channel == 0) - return 0644; - return 0; + return 0644; default: /* Shouldn't happen */ return 0; @@ -1545,12 +1541,10 @@ static int w83627ehf_do_read_intrusion(struct w83627ehf_data *data, u32 attr, int channel, long *val) { - unsigned int masks[] = { 0x10, 0x40 }; - - if (attr != hwmon_intrusion_alarm || channel > 1) + if (attr != hwmon_intrusion_alarm || channel != 0) return -EOPNOTSUPP; /* shouldn't happen */ - *val = !!(data->caseopen & masks[channel]); + *val = !!(data->caseopen & 0x10); return 0; } @@ -1688,7 +1682,6 @@ static const struct hwmon_channel_info *w83627ehf_info[] = { HWMON_T_ALARM | HWMON_T_INPUT | HWMON_T_LABEL | HWMON_T_MAX | HWMON_T_MAX_HYST | HWMON_T_OFFSET | HWMON_T_TYPE), HWMON_CHANNEL_INFO(intrusion, - HWMON_INTRUSION_ALARM, HWMON_INTRUSION_ALARM), NULL }; |