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

Commit 2310048d authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (it87) Use defines for array sizes and sensor counts 



Using array size defines makes it much easier to find errors
in index values and loop counts.

Tested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 48b2ae7f

drivers/hwmon/it87.c

+34 −24
Original line number Diff line number Diff line
@@ -260,6 +260,16 @@ static const u8 IT87_REG_VIN[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 


#define IT87_REG_TEMP456_ENABLE	0x77



#define NUM_VIN			ARRAY_SIZE(IT87_REG_VIN)

#define NUM_VIN_LIMIT		8

#define NUM_TEMP		6

#define NUM_TEMP_OFFSET		ARRAY_SIZE(IT87_REG_TEMP_OFFSET)

#define NUM_TEMP_LIMIT		3

#define NUM_FAN			ARRAY_SIZE(IT87_REG_FAN)

#define NUM_FAN_DIV		3

#define NUM_PWM			ARRAY_SIZE(IT87_REG_PWM)

#define NUM_AUTO_PWM		ARRAY_SIZE(IT87_REG_PWM)



struct it87_devices {

	const char *name;

	const char * const suffix;
@@ -484,14 +494,14 @@ struct it87_data { 
	u16 in_scaled;		/* Internal voltage sensors are scaled */

	u16 in_internal;	/* Bitfield, internal sensors (for labels) */

	u16 has_in;		/* Bitfield, voltage sensors enabled */

	u8 in[13][3];		/* [nr][0]=in, [1]=min, [2]=max */

	u8 in[NUM_VIN][3];		/* [nr][0]=in, [1]=min, [2]=max */

	u8 has_fan;		/* Bitfield, fans enabled */

	u16 fan[6][2];		/* Register values, [nr][0]=fan, [1]=min */

	u16 fan[NUM_FAN][2];	/* Register values, [nr][0]=fan, [1]=min */

	u8 has_temp;		/* Bitfield, temp sensors enabled */

	s8 temp[6][4];		/* [nr][0]=temp, [1]=min, [2]=max, [3]=offset */

	s8 temp[NUM_TEMP][4];	/* [nr][0]=temp, [1]=min, [2]=max, [3]=offset */

	u8 sensor;		/* Register value (IT87_REG_TEMP_ENABLE) */

	u8 extra;		/* Register value (IT87_REG_TEMP_EXTRA) */

	u8 fan_div[3];		/* Register encoding, shifted right */

	u8 fan_div[NUM_FAN_DIV];/* Register encoding, shifted right */

	bool has_vid;		/* True if VID supported */

	u8 vid;			/* Register encoding, combined */

	u8 vrm;
@@ -512,13 +522,13 @@ struct it87_data { 
	 * simple.

	 */

	u8 has_pwm;		/* Bitfield, pwm control enabled */

	u8 pwm_ctrl[6];		/* Register value */

	u8 pwm_duty[6];		/* Manual PWM value set by user */

	u8 pwm_temp_map[6];	/* PWM to temp. chan. mapping (bits 1-0) */

	u8 pwm_ctrl[NUM_PWM];	/* Register value */

	u8 pwm_duty[NUM_PWM];	/* Manual PWM value set by user */

	u8 pwm_temp_map[NUM_PWM];/* PWM to temp. chan. mapping (bits 1-0) */



	/* Automatic fan speed control registers */

	u8 auto_pwm[3][4];	/* [nr][3] is hard-coded */

	s8 auto_temp[3][5];	/* [nr][0] is point1_temp_hyst */

	u8 auto_pwm[NUM_AUTO_PWM][4];	/* [nr][3] is hard-coded */

	s8 auto_temp[NUM_AUTO_PWM][5];	/* [nr][0] is point1_temp_hyst */

};



static int adc_lsb(const struct it87_data *data, int nr)
@@ -686,7 +696,7 @@ static struct it87_data *it87_update_device(struct device *dev) 
			it87_write_value(data, IT87_REG_CONFIG,

				it87_read_value(data, IT87_REG_CONFIG) | 0x40);

		}

		for (i = 0; i < ARRAY_SIZE(IT87_REG_VIN); i++) {

		for (i = 0; i < NUM_VIN; i++) {

			if (!(data->has_in & BIT(i)))

				continue;
@@ -694,7 +704,7 @@ static struct it87_data *it87_update_device(struct device *dev) 
				it87_read_value(data, IT87_REG_VIN[i]);



			/* VBAT and AVCC don't have limit registers */

			if (i >= 8)

			if (i >= NUM_VIN_LIMIT)

				continue;



			data->in[i][1] =
@@ -703,7 +713,7 @@ static struct it87_data *it87_update_device(struct device *dev) 
				it87_read_value(data, IT87_REG_VIN_MAX(i));

		}



		for (i = 0; i < 6; i++) {

		for (i = 0; i < NUM_FAN; i++) {

			/* Skip disabled fans */

			if (!(data->has_fan & BIT(i)))

				continue;
@@ -720,24 +730,24 @@ static struct it87_data *it87_update_device(struct device *dev) 
						IT87_REG_FANX_MIN[i]) << 8;

			}

		}

		for (i = 0; i < 6; i++) {

		for (i = 0; i < NUM_TEMP; i++) {

			if (!(data->has_temp & BIT(i)))

				continue;

			data->temp[i][0] =

				it87_read_value(data, IT87_REG_TEMP(i));



			/* No limits/offset for additional sensors */

			if (i >= 3)

			if (has_temp_offset(data) && i < NUM_TEMP_OFFSET)

				data->temp[i][3] =

				  it87_read_value(data,

						  IT87_REG_TEMP_OFFSET[i]);



			if (i >= NUM_TEMP_LIMIT)

				continue;



			data->temp[i][1] =

				it87_read_value(data, IT87_REG_TEMP_LOW(i));

			data->temp[i][2] =

				it87_read_value(data, IT87_REG_TEMP_HIGH(i));

			if (has_temp_offset(data))

				data->temp[i][3] =

				  it87_read_value(data,

						  IT87_REG_TEMP_OFFSET[i]);

		}



		/* Newer chips don't have clock dividers */
@@ -757,7 +767,7 @@ static struct it87_data *it87_update_device(struct device *dev) 
		data->fan_main_ctrl = it87_read_value(data,

				IT87_REG_FAN_MAIN_CTRL);

		data->fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL);

		for (i = 0; i < 6; i++)

		for (i = 0; i < NUM_PWM; i++)

			it87_update_pwm_ctrl(data, i);



		data->sensor = it87_read_value(data, IT87_REG_TEMP_ENABLE);
@@ -2509,7 +2519,7 @@ static void it87_init_device(struct platform_device *pdev) 
	 * these have separate registers for the temperature mapping and the

	 * manual duty cycle.

	 */

	for (i = 0; i < 3; i++) {

	for (i = 0; i < NUM_AUTO_PWM; i++) {

		data->pwm_temp_map[i] = i;

		data->pwm_duty[i] = 0x7f;	/* Full speed */

		data->auto_pwm[i][3] = 0x7f;	/* Full speed, hard-coded */
@@ -2522,12 +2532,12 @@ static void it87_init_device(struct platform_device *pdev) 
	 * means -1 degree C, which surprisingly doesn't trigger an alarm,

	 * but is still confusing, so change to 127 degrees C.

	 */

	for (i = 0; i < 8; i++) {

	for (i = 0; i < NUM_VIN_LIMIT; i++) {

		tmp = it87_read_value(data, IT87_REG_VIN_MIN(i));

		if (tmp == 0xff)

			it87_write_value(data, IT87_REG_VIN_MIN(i), 0);

	}

	for (i = 0; i < 3; i++) {

	for (i = 0; i < NUM_TEMP_LIMIT; i++) {

		tmp = it87_read_value(data, IT87_REG_TEMP_HIGH(i));

		if (tmp == 0xff)

			it87_write_value(data, IT87_REG_TEMP_HIGH(i), 127);
@@ -2620,7 +2630,7 @@ static int it87_check_pwm(struct device *dev) 
			int i;

			u8 pwm[3];



			for (i = 0; i < 3; i++)

			for (i = 0; i < ARRAY_SIZE(pwm); i++)

				pwm[i] = it87_read_value(data,

							 IT87_REG_PWM[i]);