linux-kernel - Re: [PATCH v5 08/10] power: supply: rt5033_battery: Adopt status property from charger

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230514224803.bm7bid6pl7li5kw7@mercury.elektranox.org>
Date:   Mon, 15 May 2023 00:48:03 +0200
From:   Sebastian Reichel <sebastian.reichel@...labora.com>
To:     Jakob Hauser <jahau@...ketmail.com>
Cc:     Lee Jones <lee@...nel.org>, Liam Girdwood <lgirdwood@...il.com>,
        Mark Brown <broonie@...nel.org>,
        Rob Herring <robh+dt@...nel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
        Beomho Seo <beomho.seo@...sung.com>,
        Chanwoo Choi <cw00.choi@...sung.com>,
        Stephan Gerhold <stephan@...hold.net>,
        Raymond Hackley <raymondhackley@...tonmail.com>,
        Pavel Machek <pavel@....cz>, Axel Lin <axel.lin@...ics.com>,
        ChiYuan Huang <cy_huang@...htek.com>,
        Linus Walleij <linus.walleij@...aro.org>,
        Henrik Grimler <henrik@...mler.se>, linux-pm@...r.kernel.org,
        devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
        phone-devel@...r.kernel.org, ~postmarketos/upstreaming@...ts.sr.ht
Subject: Re: [PATCH v5 08/10] power: supply: rt5033_battery: Adopt status
 property from charger

Hi,

On Sun, May 14, 2023 at 02:31:28PM +0200, Jakob Hauser wrote:
> The rt5033-battery fuelgauge can't get a status by itself. The rt5033-charger
> can, let's get this value.
> 
> To get the charger as a "supplier" from the devicetree, the "of_node" needs
> to be initiated.
> 
> Additionally, in the probe function replace dev_err() with dev_err_probe(),
> this will avoid printing an error for -EPROBE_DEFER when the battery driver
> probes before the charger driver.
> 
> Signed-off-by: Jakob Hauser <jahau@...ketmail.com>
> ---

Acked-by: Sebastian Reichel <sebastian.reichel@...labora.com>

-- Sebastian

>  drivers/power/supply/rt5033_battery.c | 29 +++++++++++++++++++++------
>  1 file changed, 23 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/rt5033_battery.c
> index 91e1efd81f69..94d2dea7ef5e 100644
> --- a/drivers/power/supply/rt5033_battery.c
> +++ b/drivers/power/supply/rt5033_battery.c
> @@ -19,6 +19,21 @@ struct rt5033_battery {
>  	struct power_supply	*psy;
>  };
>  
> +static int rt5033_battery_get_status(struct i2c_client *client)
> +{
> +	struct rt5033_battery *battery = i2c_get_clientdata(client);
> +	union power_supply_propval val;
> +	int ret;
> +
> +	ret = power_supply_get_property_from_supplier(battery->psy,
> +						POWER_SUPPLY_PROP_STATUS,
> +						&val);
> +	if (ret)
> +		val.intval = POWER_SUPPLY_STATUS_UNKNOWN;
> +
> +	return val.intval;
> +}
> +
>  static int rt5033_battery_get_capacity(struct i2c_client *client)
>  {
>  	struct rt5033_battery *battery = i2c_get_clientdata(client);
> @@ -91,6 +106,9 @@ static int rt5033_battery_get_property(struct power_supply *psy,
>  	case POWER_SUPPLY_PROP_CAPACITY:
>  		val->intval = rt5033_battery_get_capacity(battery->client);
>  		break;
> +	case POWER_SUPPLY_PROP_STATUS:
> +		val->intval = rt5033_battery_get_status(battery->client);
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
> @@ -103,6 +121,7 @@ static enum power_supply_property rt5033_battery_props[] = {
>  	POWER_SUPPLY_PROP_VOLTAGE_OCV,
>  	POWER_SUPPLY_PROP_PRESENT,
>  	POWER_SUPPLY_PROP_CAPACITY,
> +	POWER_SUPPLY_PROP_STATUS,
>  };
>  
>  static const struct regmap_config rt5033_battery_regmap_config = {
> @@ -124,7 +143,6 @@ static int rt5033_battery_probe(struct i2c_client *client)
>  	struct i2c_adapter *adapter = client->adapter;
>  	struct power_supply_config psy_cfg = {};
>  	struct rt5033_battery *battery;
> -	u32 ret;
>  
>  	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
>  		return -EIO;
> @@ -142,15 +160,14 @@ static int rt5033_battery_probe(struct i2c_client *client)
>  	}
>  
>  	i2c_set_clientdata(client, battery);
> +	psy_cfg.of_node = client->dev.of_node;
>  	psy_cfg.drv_data = battery;
>  
>  	battery->psy = power_supply_register(&client->dev,
>  					     &rt5033_battery_desc, &psy_cfg);
> -	if (IS_ERR(battery->psy)) {
> -		dev_err(&client->dev, "Failed to register power supply\n");
> -		ret = PTR_ERR(battery->psy);
> -		return ret;
> -	}
> +	if (IS_ERR(battery->psy))
> +		return dev_err_probe(&client->dev, PTR_ERR(battery->psy),
> +				     "Failed to register power supply\n");
>  
>  	return 0;
>  }
> -- 
> 2.39.2
> 

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)