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

Commit 18524486 authored by Mark M. Hoffman's avatar Mark M. Hoffman
Browse files

hwmon: (adt7473) minor cleanup / refactoring 



Acked-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
parent 5d822e9b

drivers/hwmon/adt7473.c

+23 −22
Original line number Diff line number Diff line
@@ -422,18 +422,14 @@ static ssize_t show_volt(struct device *dev, struct device_attribute *devattr, 
 * number in the range -128 to 127, or as an unsigned number that must

 * be offset by 64.

 */

static int decode_temp(struct adt7473_data *data, u8 raw)

static int decode_temp(u8 twos_complement, u8 raw)

{

	if (data->temp_twos_complement)

		return (s8)raw;

	return raw - 64;

	return twos_complement ? (s8)raw : raw - 64;

}



static u8 encode_temp(struct adt7473_data *data, int cooked)

static u8 encode_temp(u8 twos_complement, int cooked)

{

	if (data->temp_twos_complement)

		return (cooked & 0xFF);

	return cooked + 64;

	return twos_complement ? cooked & 0xFF : cooked + 64;

}



static ssize_t show_temp_min(struct device *dev,
@@ -442,8 +438,9 @@ static ssize_t show_temp_min(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct adt7473_data *data = adt7473_update_device(dev);

	return sprintf(buf, "%d\n",

		       1000 * decode_temp(data, data->temp_min[attr->index]));

	return sprintf(buf, "%d\n", 1000 * decode_temp(

						data->temp_twos_complement,

						data->temp_min[attr->index]));

}



static ssize_t set_temp_min(struct device *dev,
@@ -455,7 +452,7 @@ static ssize_t set_temp_min(struct device *dev, 
	struct i2c_client *client = to_i2c_client(dev);

	struct adt7473_data *data = i2c_get_clientdata(client);

	int temp = simple_strtol(buf, NULL, 10) / 1000;

	temp = encode_temp(data, temp);

	temp = encode_temp(data->temp_twos_complement, temp);



	mutex_lock(&data->lock);

	data->temp_min[attr->index] = temp;
@@ -472,8 +469,9 @@ static ssize_t show_temp_max(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct adt7473_data *data = adt7473_update_device(dev);

	return sprintf(buf, "%d\n",

		       1000 * decode_temp(data, data->temp_max[attr->index]));

	return sprintf(buf, "%d\n", 1000 * decode_temp(

						data->temp_twos_complement,

						data->temp_max[attr->index]));

}



static ssize_t set_temp_max(struct device *dev,
@@ -485,7 +483,7 @@ static ssize_t set_temp_max(struct device *dev, 
	struct i2c_client *client = to_i2c_client(dev);

	struct adt7473_data *data = i2c_get_clientdata(client);

	int temp = simple_strtol(buf, NULL, 10) / 1000;

	temp = encode_temp(data, temp);

	temp = encode_temp(data->temp_twos_complement, temp);



	mutex_lock(&data->lock);

	data->temp_max[attr->index] = temp;
@@ -501,8 +499,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct adt7473_data *data = adt7473_update_device(dev);

	return sprintf(buf, "%d\n",

		       1000 * decode_temp(data, data->temp[attr->index]));

	return sprintf(buf, "%d\n", 1000 * decode_temp(

						data->temp_twos_complement,

						data->temp[attr->index]));

}



static ssize_t show_fan_min(struct device *dev,
@@ -671,8 +670,9 @@ static ssize_t show_temp_tmax(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct adt7473_data *data = adt7473_update_device(dev);

	return sprintf(buf, "%d\n",

		       1000 * decode_temp(data, data->temp_tmax[attr->index]));

	return sprintf(buf, "%d\n", 1000 * decode_temp(

						data->temp_twos_complement,

						data->temp_tmax[attr->index]));

}



static ssize_t set_temp_tmax(struct device *dev,
@@ -684,7 +684,7 @@ static ssize_t set_temp_tmax(struct device *dev, 
	struct i2c_client *client = to_i2c_client(dev);

	struct adt7473_data *data = i2c_get_clientdata(client);

	int temp = simple_strtol(buf, NULL, 10) / 1000;

	temp = encode_temp(data, temp);

	temp = encode_temp(data->temp_twos_complement, temp);



	mutex_lock(&data->lock);

	data->temp_tmax[attr->index] = temp;
@@ -701,8 +701,9 @@ static ssize_t show_temp_tmin(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct adt7473_data *data = adt7473_update_device(dev);

	return sprintf(buf, "%d\n",

		       1000 * decode_temp(data, data->temp_tmin[attr->index]));

	return sprintf(buf, "%d\n", 1000 * decode_temp(

						data->temp_twos_complement,

						data->temp_tmin[attr->index]));

}



static ssize_t set_temp_tmin(struct device *dev,
@@ -714,7 +715,7 @@ static ssize_t set_temp_tmin(struct device *dev, 
	struct i2c_client *client = to_i2c_client(dev);

	struct adt7473_data *data = i2c_get_clientdata(client);

	int temp = simple_strtol(buf, NULL, 10) / 1000;

	temp = encode_temp(data, temp);

	temp = encode_temp(data->temp_twos_complement, temp);



	mutex_lock(&data->lock);

	data->temp_tmin[attr->index] = temp;