Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a2d27da authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

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: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent edff2f8d

drivers/hwmon/w83795.c

+20 −10
Original line number Diff line number Diff line
@@ -966,17 +966,18 @@ show_temp_src(struct device *dev, struct device_attribute *attr, char *buf) 
	    to_sensor_dev_attr_2(attr);

	struct w83795_data *data = w83795_update_pwm_config(dev);

	int index = sensor_attr->index;

	u8 val = index / 2;

	u8 tmp = data->temp_src[val];

	u8 tmp = data->temp_src[index / 2];



	if (index & 1)

		val = 4;

		tmp >>= 4;	/* Pick high nibble */

	else

		val = 0;

	tmp >>= val;

	tmp &= 0x0f;

		tmp &= 0x0f;	/* Pick low nibble */



	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
@@ -988,12 +989,21 @@ store_temp_src(struct device *dev, struct device_attribute *attr, 
	struct sensor_device_attribute_2 *sensor_attr =

	    to_sensor_dev_attr_2(attr);

	int index = sensor_attr->index;

	unsigned long tmp;

	int tmp;

	unsigned long channel;

	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;

	tmp = SENSORS_LIMIT(tmp, 0, 15);



	mutex_lock(&data->update_lock);

	if (index & 1) {