hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (w83795) Print the actual temperature channels as sources 

Don't expose raw register values to user-space. Decode and encode
temperature channels selected as temperature sources as needed.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
This commit is contained in:
Jean Delvare 2010-11-15 21:38:56 +01:00 committed by Jean Delvare
parent edff2f8d81
commit 2a2d27da00
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/hwmon/w83795.c
View File

@ -966,17 +966,18 @@ show_temp_src(struct device *dev, struct device_attribute *attr, char *buf)
to_sensor_dev_attr_2(attr); to_sensor_dev_attr_2(attr);
struct w83795_data *data = w83795_update_pwm_config(dev); struct w83795_data *data = w83795_update_pwm_config(dev);
int index = sensor_attr->index; int index = sensor_attr->index;
u8 val = index / 2; u8 tmp = data->temp_src[index / 2];
u8 tmp = data->temp_src[val];
if (index & 1) if (index & 1)
val = 4; tmp >>= 4; /* Pick high nibble */
else else
val = 0; tmp &= 0x0f; /* Pick low nibble */
tmp >>= val;
tmp &= 0x0f;
return sprintf(buf, "%u\n", tmp); /* Look-up the actual temperature channel number */
if (tmp >= 4 || tss_map[tmp][index] == TSS_MAP_RESERVED)
return -EINVAL; /* Shouldn't happen */
return sprintf(buf, "%u\n", (unsigned int)tss_map[tmp][index] + 1);
} }
static ssize_t static ssize_t
@ -988,12 +989,21 @@ store_temp_src(struct device *dev, struct device_attribute *attr,
struct sensor_device_attribute_2 *sensor_attr = struct sensor_device_attribute_2 *sensor_attr =
to_sensor_dev_attr_2(attr); to_sensor_dev_attr_2(attr);
int index = sensor_attr->index; int index = sensor_attr->index;
unsigned long tmp; int tmp;
unsigned long channel;
u8 val = index / 2; u8 val = index / 2;
if (strict_strtoul(buf, 10, &tmp) < 0) if (strict_strtoul(buf, 10, &channel) < 0 ||
channel < 1 || channel > 14)
return -EINVAL;
/* Check if request can be fulfilled */
for (tmp = 0; tmp < 4; tmp++) {
if (tss_map[tmp][index] == channel - 1)
break;
}
if (tmp == 4) /* No match */
return -EINVAL; return -EINVAL;
tmp = SENSORS_LIMIT(tmp, 0, 15);
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
if (index & 1) { if (index & 1) {