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

Commit 2ccc8731 authored by Jean Delvare's avatar Jean Delvare Committed by Guenter Roeck
Browse files

hwmon: (jc42) Simplify hysteresis mask 



Define JC42_CFG_HYST_MASK as the mask _before_ shifting instead of
after shifting. This simplifies the current code slightly, and will
simplify the code to come even more.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 9baeb8fd

drivers/hwmon/jc42.c

+6 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const unsigned short normal_i2c[] = { 
#define JC42_CFG_EVENT_LOCK	(1 << 7)

#define JC42_CFG_SHUTDOWN	(1 << 8)

#define JC42_CFG_HYST_SHIFT	9

#define JC42_CFG_HYST_MASK	0x03

#define JC42_CFG_HYST_MASK	(0x03 << 9)



/* Capabilities */

#define JC42_CAP_RANGE		(1 << 2)
@@ -287,8 +287,8 @@ static ssize_t show_temp_crit_hyst(struct device *dev, 
		return PTR_ERR(data);



	temp = jc42_temp_from_reg(data->temp_crit);

	hyst = jc42_hysteresis[(data->config >> JC42_CFG_HYST_SHIFT)

			       & JC42_CFG_HYST_MASK];

	hyst = jc42_hysteresis[(data->config & JC42_CFG_HYST_MASK)

			       >> JC42_CFG_HYST_SHIFT];

	return sprintf(buf, "%d\n", temp - hyst);

}
@@ -302,8 +302,8 @@ static ssize_t show_temp_max_hyst(struct device *dev, 
		return PTR_ERR(data);



	temp = jc42_temp_from_reg(data->temp_max);

	hyst = jc42_hysteresis[(data->config >> JC42_CFG_HYST_SHIFT)

			       & JC42_CFG_HYST_MASK];

	hyst = jc42_hysteresis[(data->config & JC42_CFG_HYST_MASK)

			       >> JC42_CFG_HYST_SHIFT];

	return sprintf(buf, "%d\n", temp - hyst);

}
@@ -362,8 +362,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev, 
	}



	mutex_lock(&data->update_lock);

	data->config = (data->config

			& ~(JC42_CFG_HYST_MASK << JC42_CFG_HYST_SHIFT))

	data->config = (data->config & ~JC42_CFG_HYST_MASK)

	  | (hyst << JC42_CFG_HYST_SHIFT);

	err = i2c_smbus_write_word_swapped(client, JC42_REG_CONFIG,

					   data->config);