Linux-Hwmon Archive on lore.kernel.org
 help / color / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: "Dr. David Alan Gilbert" <linux@treblig.org>
Cc: jdelvare@suse.com, linux-hwmon@vger.kernel.org
Subject: Re: [PATCH 1/2] hwmon: Add intrusion templates
Date: Fri, 29 Nov 2019 10:39:32 -0800
Message-ID: <20191129183932.GA7110@roeck-us.net> (raw)
In-Reply-To: <20191124202030.45360-2-linux@treblig.org>

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.

  reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-24 20:20 [PATCH 0/2] hwmon: convert w83627ehf to new interface Dr. David Alan Gilbert
2019-11-24 20:20 ` [PATCH 1/2] hwmon: Add intrusion templates Dr. David Alan Gilbert
2019-11-29 18:39   ` Guenter Roeck [this message]
2019-11-24 20:20 ` [PATCH 2/2] hwmon: (w83627ehf) convert to with_info interface Dr. David Alan Gilbert
2019-12-07 13:51   ` Guenter Roeck
2019-12-07 16:49     ` Dr. David Alan Gilbert

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191129183932.GA7110@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=jdelvare@suse.com \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux@treblig.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Hwmon Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-hwmon/0 linux-hwmon/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-hwmon linux-hwmon/ https://lore.kernel.org/linux-hwmon \
		linux-hwmon@vger.kernel.org
	public-inbox-index linux-hwmon

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-hwmon


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git