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

Commit 5f348fa3 authored by Stefan Schaeckeler's avatar Stefan Schaeckeler Committed by Guenter Roeck
Browse files

hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1 



Make fan and pwm names in sysfs start with index 1 in accordance to
Documentation/hwmon/sysfs-interface conventions.

Current implementation starts with index 0, making tools such as
sensors(1) skip the first fan.

Signed-off-by: default avatarStefan Schaeckeler <sschaeck@cisco.com>
Fixes: 2d7a548a ("drivers: hwmon: Support for ASPEED PWM/Fan tach")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 4d58e732

drivers/hwmon/aspeed-pwm-tacho.c

+26 −26
Original line number Diff line number Diff line
@@ -597,24 +597,23 @@ static umode_t fan_dev_is_visible(struct kobject *kobj, 
	return a->mode;

}



static SENSOR_DEVICE_ATTR(pwm0, 0644,

			show_pwm, set_pwm, 0);

static SENSOR_DEVICE_ATTR(pwm1, 0644,

			show_pwm, set_pwm, 1);

			show_pwm, set_pwm, 0);

static SENSOR_DEVICE_ATTR(pwm2, 0644,

			show_pwm, set_pwm, 2);

			show_pwm, set_pwm, 1);

static SENSOR_DEVICE_ATTR(pwm3, 0644,

			show_pwm, set_pwm, 3);

			show_pwm, set_pwm, 2);

static SENSOR_DEVICE_ATTR(pwm4, 0644,

			show_pwm, set_pwm, 4);

			show_pwm, set_pwm, 3);

static SENSOR_DEVICE_ATTR(pwm5, 0644,

			show_pwm, set_pwm, 5);

			show_pwm, set_pwm, 4);

static SENSOR_DEVICE_ATTR(pwm6, 0644,

			show_pwm, set_pwm, 6);

			show_pwm, set_pwm, 5);

static SENSOR_DEVICE_ATTR(pwm7, 0644,

			show_pwm, set_pwm, 6);

static SENSOR_DEVICE_ATTR(pwm8, 0644,

			show_pwm, set_pwm, 7);

static struct attribute *pwm_dev_attrs[] = {

	&sensor_dev_attr_pwm0.dev_attr.attr,

	&sensor_dev_attr_pwm1.dev_attr.attr,

	&sensor_dev_attr_pwm2.dev_attr.attr,

	&sensor_dev_attr_pwm3.dev_attr.attr,
@@ -622,6 +621,7 @@ static struct attribute *pwm_dev_attrs[] = { 
	&sensor_dev_attr_pwm5.dev_attr.attr,

	&sensor_dev_attr_pwm6.dev_attr.attr,

	&sensor_dev_attr_pwm7.dev_attr.attr,

	&sensor_dev_attr_pwm8.dev_attr.attr,

	NULL,

};
@@ -630,40 +630,39 @@ static const struct attribute_group pwm_dev_group = { 
	.is_visible = pwm_is_visible,

};



static SENSOR_DEVICE_ATTR(fan0_input, 0444,

		show_rpm, NULL, 0);

static SENSOR_DEVICE_ATTR(fan1_input, 0444,

		show_rpm, NULL, 1);

		show_rpm, NULL, 0);

static SENSOR_DEVICE_ATTR(fan2_input, 0444,

		show_rpm, NULL, 2);

		show_rpm, NULL, 1);

static SENSOR_DEVICE_ATTR(fan3_input, 0444,

		show_rpm, NULL, 3);

		show_rpm, NULL, 2);

static SENSOR_DEVICE_ATTR(fan4_input, 0444,

		show_rpm, NULL, 4);

		show_rpm, NULL, 3);

static SENSOR_DEVICE_ATTR(fan5_input, 0444,

		show_rpm, NULL, 5);

		show_rpm, NULL, 4);

static SENSOR_DEVICE_ATTR(fan6_input, 0444,

		show_rpm, NULL, 6);

		show_rpm, NULL, 5);

static SENSOR_DEVICE_ATTR(fan7_input, 0444,

		show_rpm, NULL, 7);

		show_rpm, NULL, 6);

static SENSOR_DEVICE_ATTR(fan8_input, 0444,

		show_rpm, NULL, 8);

		show_rpm, NULL, 7);

static SENSOR_DEVICE_ATTR(fan9_input, 0444,

		show_rpm, NULL, 9);

		show_rpm, NULL, 8);

static SENSOR_DEVICE_ATTR(fan10_input, 0444,

		show_rpm, NULL, 10);

		show_rpm, NULL, 9);

static SENSOR_DEVICE_ATTR(fan11_input, 0444,

		show_rpm, NULL, 11);

		show_rpm, NULL, 10);

static SENSOR_DEVICE_ATTR(fan12_input, 0444,

		show_rpm, NULL, 12);

		show_rpm, NULL, 11);

static SENSOR_DEVICE_ATTR(fan13_input, 0444,

		show_rpm, NULL, 13);

		show_rpm, NULL, 12);

static SENSOR_DEVICE_ATTR(fan14_input, 0444,

		show_rpm, NULL, 14);

		show_rpm, NULL, 13);

static SENSOR_DEVICE_ATTR(fan15_input, 0444,

		show_rpm, NULL, 14);

static SENSOR_DEVICE_ATTR(fan16_input, 0444,

		show_rpm, NULL, 15);

static struct attribute *fan_dev_attrs[] = {

	&sensor_dev_attr_fan0_input.dev_attr.attr,

	&sensor_dev_attr_fan1_input.dev_attr.attr,

	&sensor_dev_attr_fan2_input.dev_attr.attr,

	&sensor_dev_attr_fan3_input.dev_attr.attr,
@@ -679,6 +678,7 @@ static struct attribute *fan_dev_attrs[] = { 
	&sensor_dev_attr_fan13_input.dev_attr.attr,

	&sensor_dev_attr_fan14_input.dev_attr.attr,

	&sensor_dev_attr_fan15_input.dev_attr.attr,

	&sensor_dev_attr_fan16_input.dev_attr.attr,

	NULL

};