Message ID | 20240204-power_supply-charge_behaviour_prop-v1-4-06a20c958f96@weissschuh.net (mailing list archive) |
---|---|
State | Handled Elsewhere, archived |
Headers | show |
Series | power: supply: core: align charge_behaviour format with docs | expand |
Hi Thomas, On 2/4/24 18:26, Thomas Weißschuh wrote: > As the mm8013 driver was extended to also report that property the > workaround is not needed anymore. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > drivers/power/supply/power_supply_sysfs.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c > index 3680cfc2e908..3804a3bbed24 100644 > --- a/drivers/power/supply/power_supply_sysfs.c > +++ b/drivers/power/supply/power_supply_sysfs.c > @@ -273,7 +273,6 @@ static ssize_t power_supply_show_usb_type(struct device *dev, > > static ssize_t power_supply_show_charge_behaviour(struct device *dev, > struct power_supply *psy, > - struct power_supply_attr *ps_attr, > union power_supply_propval *value, > char *buf) > { > @@ -289,9 +288,7 @@ static ssize_t power_supply_show_charge_behaviour(struct device *dev, > ret = power_supply_get_property(psy, > POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR_AVAILABLE, > &available); > - if (ret == -EINVAL) > - return sysfs_emit(buf, "%s\n", ps_attr->text_values[value->intval]); More of a remark on patch 1 really, note that if you use POWER_SUPPLY_CHARGE_BEHAVIOUR_TEXT[] here in patch 1, e.g. : return sysfs_emit(buf, "%s\n", POWER_SUPPLY_CHARGE_BEHAVIOUR_TEXT[value->intval]); then you can omit the ps_attr argument in patch 1 already, which in turn will cause this patch to be simpler / smaller. Regards, Hans > - else if (ret < 0) > + if (ret < 0) > return ret; > > return power_supply_charge_behaviour_show(dev, available.intval, value->intval, buf); > @@ -337,8 +334,7 @@ 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, ps_attr, > - &value, buf); > + ret = power_supply_show_charge_behaviour(dev, psy, &value, buf); > break; > case POWER_SUPPLY_PROP_MODEL_NAME ... POWER_SUPPLY_PROP_SERIAL_NUMBER: > ret = sysfs_emit(buf, "%s\n", value.strval); >
diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 3680cfc2e908..3804a3bbed24 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -273,7 +273,6 @@ static ssize_t power_supply_show_usb_type(struct device *dev, static ssize_t power_supply_show_charge_behaviour(struct device *dev, struct power_supply *psy, - struct power_supply_attr *ps_attr, union power_supply_propval *value, char *buf) { @@ -289,9 +288,7 @@ static ssize_t power_supply_show_charge_behaviour(struct device *dev, ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR_AVAILABLE, &available); - if (ret == -EINVAL) - return sysfs_emit(buf, "%s\n", ps_attr->text_values[value->intval]); - else if (ret < 0) + if (ret < 0) return ret; return power_supply_charge_behaviour_show(dev, available.intval, value->intval, buf); @@ -337,8 +334,7 @@ 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, ps_attr, - &value, buf); + ret = power_supply_show_charge_behaviour(dev, psy, &value, buf); break; case POWER_SUPPLY_PROP_MODEL_NAME ... POWER_SUPPLY_PROP_SERIAL_NUMBER: ret = sysfs_emit(buf, "%s\n", value.strval);
As the mm8013 driver was extended to also report that property the workaround is not needed anymore. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- drivers/power/supply/power_supply_sysfs.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)