Skip to content

Commit

Permalink
hwmon: (w83627ehf) Now only one intrusion channel
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dr. David Alan Gilbert authored and Guenter Roeck committed Jan 23, 2020
1 parent 6959550 commit 931f397
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions drivers/hwmon/w83627ehf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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
};
Expand Down

0 comments on commit 931f397

Please sign in to comment.