power: supply: core: simplify charge_behaviour formatting

The function power_supply_show_charge_behaviour() is not needed and can
be removed completely.
Removing the function also saves a spurious read of the property from
the driver on each call.

The convulted logic was a leftover from an earlier patch revision.
Some restructuring made this cleanup possible.

Suggested-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/all/9e035ae4-cb07-4f84-8336-1a0050855bea@redhat.com/
Fixes: 4e61f1e9d58f ("power: supply: core: fix charge_behaviour formatting")
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240329-power-supply-simplify-v1-1-416f1002739f@weissschuh.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index 0d2c3724d0bc0e7fd7022d71d67f166df0d14d6c..b86e11bdc07ef8d6bbdb2702ea10982b8a06d27c 100644 (file)
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -271,23 +271,6 @@ static ssize_t power_supply_show_usb_type(struct device *dev,
        return count;
 }
 
-static ssize_t power_supply_show_charge_behaviour(struct device *dev,
-                                                 struct power_supply *psy,
-                                                 union power_supply_propval *value,
-                                                 char *buf)
-{
-       int ret;
-
-       ret = power_supply_get_property(psy,
-                                       POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR,
-                                       value);
-       if (ret < 0)
-               return ret;
-
-       return power_supply_charge_behaviour_show(dev, psy->desc->charge_behaviours,
-                                                 value->intval, buf);
-}
-
 static ssize_t power_supply_show_property(struct device *dev,
                                          struct device_attribute *attr,
                                          char *buf) {
@@ -321,7 +304,8 @@ static ssize_t power_supply_show_property(struct device *dev,
                                                &value, buf);
                break;
        case POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR:
-               ret = power_supply_show_charge_behaviour(dev, psy, &value, buf);
+               ret = power_supply_charge_behaviour_show(dev, psy->desc->charge_behaviours,
+                                                        value.intval, buf);
                break;
        case POWER_SUPPLY_PROP_MODEL_NAME ... POWER_SUPPLY_PROP_SERIAL_NUMBER:
                ret = sysfs_emit(buf, "%s\n", value.strval);