Received-SPF: pass (google.com: domain of linux-kernel+bounces-93166-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 6 Mar 2024 01:25:48 +0100
From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= <linux@weissschuh.net>
Cc: Hans de Goede <hdegoede@redhat.com>, 
	Konrad Dybcio <konradybcio@kernel.org>, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/4] power: supply: core: ease special formatting
 implementations
Message-ID: <642pog5hxkmycr4qeymb45or27akilry3g564mq5hykzsw77la@saanb24r5ren>
References: <20240303-power_supply-charge_behaviour_prop-v2-0-8ebb0a7c2409@weissschuh.net>
 <20240303-power_supply-charge_behaviour_prop-v2-2-8ebb0a7c2409@weissschuh.net>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="wbgq7n6h3qopvjfr"
Content-Disposition: inline
In-Reply-To: <20240303-power_supply-charge_behaviour_prop-v2-2-8ebb0a7c2409@weissschuh.net>


--wbgq7n6h3qopvjfr
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Sun, Mar 03, 2024 at 04:31:14PM +0100, Thomas Wei=DFschuh wrote:
> By moving the conditional into the default-branch of the switch new
> additions to the switch won't have to bypass the conditional.
>=20
> This makes it easier to implement those special cases like the upcoming
> change to the formatting of "charge_behaviour".
>=20
> Suggested-by: Hans de Goede <hdegoede@redhat.com>
> Link: https://lore.kernel.org/lkml/53082075-852f-4698-b354-ed30e7fd2683@r=
edhat.com/
> Signed-off-by: Thomas Wei=DFschuh <linux@weissschuh.net>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/power_supply_sysfs.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>=20
> diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/su=
pply/power_supply_sysfs.c
> index 977611e16373..10fec411794b 100644
> --- a/drivers/power/supply/power_supply_sysfs.c
> +++ b/drivers/power/supply/power_supply_sysfs.c
> @@ -298,11 +298,6 @@ static ssize_t power_supply_show_property(struct dev=
ice *dev,
>  		}
>  	}
> =20
> -	if (ps_attr->text_values_len > 0 &&
> -	    value.intval < ps_attr->text_values_len && value.intval >=3D 0) {
> -		return sysfs_emit(buf, "%s\n", ps_attr->text_values[value.intval]);
> -	}
> -
>  	switch (psp) {
>  	case POWER_SUPPLY_PROP_USB_TYPE:
>  		ret =3D power_supply_show_usb_type(dev, psy->desc,
> @@ -312,7 +307,12 @@ static ssize_t power_supply_show_property(struct dev=
ice *dev,
>  		ret =3D sysfs_emit(buf, "%s\n", value.strval);
>  		break;
>  	default:
> -		ret =3D sysfs_emit(buf, "%d\n", value.intval);
> +		if (ps_attr->text_values_len > 0 &&
> +				value.intval < ps_attr->text_values_len && value.intval >=3D 0) {
> +			ret =3D sysfs_emit(buf, "%s\n", ps_attr->text_values[value.intval]);
> +		} else {
> +			ret =3D sysfs_emit(buf, "%d\n", value.intval);
> +		}
>  	}
> =20
>  	return ret;
>=20
> --=20
> 2.44.0
>=20
>=20

--wbgq7n6h3qopvjfr
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmXnuAwACgkQ2O7X88g7
+pq+ng//ZbD5cTzdIz+ii87TGWXQ5PHEpsjtjjwHapDP42/zrQwfD9jCxefJ12L0
7CuFEe3ipeg6qpvsdpSsbwzM1HLrJRoQZ5YTq+AgdNYNTA5Dc/IFONQxgQ5dva2u
hLy6wN4Sii6FbQN4VyELlF0JKRD+4+Siafs4l8QABHxfQ8/hVcZq+Sx0kMMbihFO
rCigeqPcO4PzTh0wWqEijcBmubc/Ok1dwE9fKKJjSSA3WEdUKLNV8hTcP7PE3rnf
ZcQPVQQmj54z/yTYm14aifdfc9Olx4Y2nyiAj1f4MQ4/gA+O/ZdDUJYCeLHswbrR
Q5Nuwrq2FdQyvznhfTRXqPMKqe8qEFa7gStz1aawbIt6wvWlwFslenyHwfylnqq8
5unwIGwoF/rvWqLIJHIaCuvW2Xh0RVNDJT99EwlVlR99XbteV9Eow7p53Js9biGR
wHO9jVhP7vCJsTnWzdhBcM33fl5px1DW+xhegGxP7o1M2XQLnuzWnfZzCXlcH241
41fKUoBT5bPhDer9adOzV0iTb3bwXWnLFpKP5YbzW+vKCjwedIuKoep3yl2lRnGD
GszD9dA0ZqqJQ+Y5joeO4XXCL4EXOuO4HpqLZ2DdKv4mIcEHXedPPjSO5ZlI7NVG
C0PAeFb0cu4aZwKDHtwJ3UFOMiFFTcG1uQ/i5mMrWJiQ+Twz25I=
=k3fx
-----END PGP SIGNATURE-----

--wbgq7n6h3qopvjfr--