All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Mathew King <mathewk@chromium.org>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH 4/4] power_supply: Add power supply type property to uevent env
Date: Sun, 3 May 2020 03:27:26 +0200	[thread overview]
Message-ID: <20200503012726.yasulfcxbpb4pi6p@earth.universe> (raw)
In-Reply-To: <20200424173533.48572-5-mathewk@chromium.org>

[-- Attachment #1: Type: text/plain, Size: 3186 bytes --]

Hi,

On Fri, Apr 24, 2020 at 11:35:33AM -0600, Mathew King wrote:
> Add POWER_SUPPLY_TYPE to the uevent env for power supply. Type is a
> property of all power supplies and there is a sysfs entry for it but it
> is not included in the properties array of the power supply so
> explicitly add it to the udev env.
> 
> Signed-off-by: Mathew King <mathewk@chromium.org>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  drivers/power/supply/power_supply_sysfs.c | 61 ++++++++++++++---------
>  1 file changed, 37 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
> index fbb05466b9a5..c7087cd7ffe3 100644
> --- a/drivers/power/supply/power_supply_sysfs.c
> +++ b/drivers/power/supply/power_supply_sysfs.c
> @@ -448,6 +448,37 @@ void power_supply_destroy_attrs(void)
>  	}
>  }
>  
> +static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env,
> +			   enum power_supply_property prop, char *prop_buf)
> +{
> +	int ret = 0;
> +	struct power_supply_attr *pwr_attr;
> +	struct device_attribute *dev_attr;
> +	char *line;
> +
> +	pwr_attr = &power_supply_attrs[prop];
> +	dev_attr = &pwr_attr->dev_attr;
> +
> +	ret = power_supply_show_property(dev, dev_attr, prop_buf);
> +	if (ret == -ENODEV || ret == -ENODATA) {
> +		/*
> +		 * When a battery is absent, we expect -ENODEV. Don't abort;
> +		 * send the uevent with at least the the PRESENT=0 property
> +		 */
> +		return 0;
> +	}
> +
> +	if (ret < 0)
> +		return ret;
> +
> +	line = strchr(prop_buf, '\n');
> +	if (line)
> +		*line = 0;
> +
> +	return add_uevent_var(env, "POWER_SUPPLY_%s=%s",
> +			      pwr_attr->upper_name, prop_buf);
> +}
> +
>  int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)
>  {
>  	struct power_supply *psy = dev_get_drvdata(dev);
> @@ -467,31 +498,13 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)
>  	if (!prop_buf)
>  		return -ENOMEM;
>  
> -	for (j = 0; j < psy->desc->num_properties; j++) {
> -		struct power_supply_attr *pwr_attr;
> -		struct device_attribute *dev_attr;
> -		char *line;
> -
> -		pwr_attr = &power_supply_attrs[psy->desc->properties[j]];
> -		dev_attr = &pwr_attr->dev_attr;
> -
> -		ret = power_supply_show_property(dev, dev_attr, prop_buf);
> -		if (ret == -ENODEV || ret == -ENODATA) {
> -			/* When a battery is absent, we expect -ENODEV. Don't abort;
> -			   send the uevent with at least the the PRESENT=0 property */
> -			ret = 0;
> -			continue;
> -		}
> -
> -		if (ret < 0)
> -			goto out;
> -
> -		line = strchr(prop_buf, '\n');
> -		if (line)
> -			*line = 0;
> +	ret = add_prop_uevent(dev, env, POWER_SUPPLY_PROP_TYPE, prop_buf);
> +	if (ret)
> +		goto out;
>  
> -		ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s",
> -				     pwr_attr->upper_name, prop_buf);
> +	for (j = 0; j < psy->desc->num_properties; j++) {
> +		ret = add_prop_uevent(dev, env, psy->desc->properties[j],
> +				      prop_buf);
>  		if (ret)
>  			goto out;
>  	}
> -- 
> 2.26.2.303.gf8c07b1a785-goog
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

      reply	other threads:[~2020-05-03  1:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-24 17:35 [PATCH 0/4] Cleanup power_supply_sysfs.c Mathew King
2020-04-24 17:35 ` [PATCH 1/4] power_supply: Cleanup power supply sysfs attribute list Mathew King
2020-05-02  0:32   ` Sebastian Reichel
2020-05-04 20:31     ` Mat King
2020-04-24 17:35 ` [PATCH 2/4] power_supply: Use designated initializer for property text arrays Mathew King
2020-05-02  0:34   ` Sebastian Reichel
2020-04-24 17:35 ` [PATCH 3/4] power_supply: Add a macro that maps enum properties to text values Mathew King
2020-05-03  1:20   ` Sebastian Reichel
2020-04-24 17:35 ` [PATCH 4/4] power_supply: Add power supply type property to uevent env Mathew King
2020-05-03  1:27   ` Sebastian Reichel [this message]

Reply instructions:

You may reply publicly 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=20200503012726.yasulfcxbpb4pi6p@earth.universe \
    --to=sebastian.reichel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mathewk@chromium.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.