[PATCH] drivers: hwmon: aspeed fan driver: make fan/pwm names start with index 1

[Guenter Roeck]

On Fri, Jun 02, 2017 at 12:43:28PM -0700, Stefan Schaeckeler wrote:
> 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: Stefan Schaeckeler <sschaeck at cisco.com>

Applied. Same comments as before.

Thanks,
Guenter

> ---
>  drivers/hwmon/aspeed-pwm-tacho.c | 52 ++++++++++++++++++++--------------------
>  1 file changed, 26 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c
> index d9161cd..1dbd83e 100644
> --- a/drivers/hwmon/aspeed-pwm-tacho.c
> +++ b/drivers/hwmon/aspeed-pwm-tacho.c
> @@ -591,24 +591,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,
> @@ -616,6 +615,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,
>  };
>  
> @@ -624,40 +624,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,
> @@ -673,6 +672,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
>  };
>  
> -- 
> 2.9.3
>