[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <c217d7e6-5f20-4362-b59c-adb64bd54dab@redhat.com>
Date: Wed, 27 Mar 2024 11:36:27 +0100
From: Hans de Goede <hdegoede@...hat.com>
To: Thomas Weißschuh <linux@...ssschuh.net>,
Sebastian Reichel <sre@...nel.org>, Konrad Dybcio <konradybcio@...nel.org>
Cc: linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org,
Sebastian Reichel <sebastian.reichel@...labora.com>
Subject: Re: [PATCH v2 2/4] power: supply: core: ease special formatting
implementations
Hi,
On 3/3/24 4:31 PM, Thomas Weißschuh wrote:
> By moving the conditional into the default-branch of the switch new
> additions to the switch won't have to bypass the conditional.
>
> This makes it easier to implement those special cases like the upcoming
> change to the formatting of "charge_behaviour".
>
> Suggested-by: Hans de Goede <hdegoede@...hat.com>
> Link: https://lore.kernel.org/lkml/53082075-852f-4698-b354-ed30e7fd2683@redhat.com/
> Signed-off-by: Thomas Weißschuh <linux@...ssschuh.net>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@...hat.com>
Regards,
Hans
> ---
> drivers/power/supply/power_supply_sysfs.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/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 device *dev,
> }
> }
>
> - if (ps_attr->text_values_len > 0 &&
> - value.intval < ps_attr->text_values_len && value.intval >= 0) {
> - return sysfs_emit(buf, "%s\n", ps_attr->text_values[value.intval]);
> - }
> -
> switch (psp) {
> case POWER_SUPPLY_PROP_USB_TYPE:
> ret = power_supply_show_usb_type(dev, psy->desc,
> @@ -312,7 +307,12 @@ static ssize_t power_supply_show_property(struct device *dev,
> ret = sysfs_emit(buf, "%s\n", value.strval);
> break;
> default:
> - ret = sysfs_emit(buf, "%d\n", value.intval);
> + if (ps_attr->text_values_len > 0 &&
> + value.intval < ps_attr->text_values_len && value.intval >= 0) {
> + ret = sysfs_emit(buf, "%s\n", ps_attr->text_values[value.intval]);
> + } else {
> + ret = sysfs_emit(buf, "%d\n", value.intval);
> + }
> }
>
> return ret;
>
Powered by blists - more mailing lists