Re: [PATCH 1/2] hwmon: Add intrusion templates

[Guenter Roeck <linux@roeck-us.net>]

On Sun, Nov 24, 2019 at 08:20:29PM +0000, Dr. David Alan Gilbert wrote:
> Add templates for intrusion%d_alarm and intrusion%d_beep.
> Note, these start at 0.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

Applied to hwmon-next.

Thanks,
Guenter

> ---
>  drivers/hwmon/hwmon.c | 9 ++++++++-
>  include/linux/hwmon.h | 8 ++++++++
>  2 files changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
> index 1f3b30b085b9..95a1ae178213 100644
> --- a/drivers/hwmon/hwmon.c
> +++ b/drivers/hwmon/hwmon.c
> @@ -171,7 +171,7 @@ static int hwmon_thermal_add_sensor(struct device *dev,
>  
>  static int hwmon_attr_base(enum hwmon_sensor_types type)
>  {
> -	if (type == hwmon_in)
> +	if (type == hwmon_in || type == hwmon_intrusion)
>  		return 0;
>  	return 1;
>  }
> @@ -458,6 +458,11 @@ static const char * const hwmon_pwm_attr_templates[] = {
>  	[hwmon_pwm_freq] = "pwm%d_freq",
>  };
>  
> +static const char * const hwmon_intrusion_attr_templates[] = {
> +	[hwmon_intrusion_alarm] = "intrusion%d_alarm",
> +	[hwmon_intrusion_beep]  = "intrusion%d_beep",
> +};
> +
>  static const char * const *__templates[] = {
>  	[hwmon_chip] = hwmon_chip_attrs,
>  	[hwmon_temp] = hwmon_temp_attr_templates,
> @@ -468,6 +473,7 @@ static const char * const *__templates[] = {
>  	[hwmon_humidity] = hwmon_humidity_attr_templates,
>  	[hwmon_fan] = hwmon_fan_attr_templates,
>  	[hwmon_pwm] = hwmon_pwm_attr_templates,
> +	[hwmon_intrusion] = hwmon_intrusion_attr_templates,
>  };
>  
>  static const int __templates_size[] = {
> @@ -480,6 +486,7 @@ static const int __templates_size[] = {
>  	[hwmon_humidity] = ARRAY_SIZE(hwmon_humidity_attr_templates),
>  	[hwmon_fan] = ARRAY_SIZE(hwmon_fan_attr_templates),
>  	[hwmon_pwm] = ARRAY_SIZE(hwmon_pwm_attr_templates),
> +	[hwmon_intrusion] = ARRAY_SIZE(hwmon_intrusion_attr_templates),
>  };
>  
>  static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info)
> diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
> index 72579168189d..dcda9589cdaf 100644
> --- a/include/linux/hwmon.h
> +++ b/include/linux/hwmon.h
> @@ -27,6 +27,7 @@ enum hwmon_sensor_types {
>  	hwmon_humidity,
>  	hwmon_fan,
>  	hwmon_pwm,
> +	hwmon_intrusion,
>  	hwmon_max,
>  };
>  
> @@ -306,6 +307,13 @@ enum hwmon_pwm_attributes {
>  #define HWMON_PWM_MODE			BIT(hwmon_pwm_mode)
>  #define HWMON_PWM_FREQ			BIT(hwmon_pwm_freq)
>  
> +enum hwmon_intrusion_attributes {
> +	hwmon_intrusion_alarm,
> +	hwmon_intrusion_beep,
> +};
> +#define HWMON_INTRUSION_ALARM		BIT(hwmon_intrusion_alarm)
> +#define HWMON_INTRUSION_BEEP		BIT(hwmon_intrusion_beep)
> +
>  /**
>   * struct hwmon_ops - hwmon device operations
>   * @is_visible: Callback to return attribute visibility. Mandatory.