mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 09:09:55 -04:00
power: supply: sysfs: prepare for power supply extensions
The upcoming extension API will add properties which are not part of the the power_supply_desc. Use power_supply_has_property() so the properties from extensions are also checked. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Link: https://lore.kernel.org/r/20241111-power-supply-extensions-v4-5-7240144daa8e@weissschuh.net Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
committed by
Sebastian Reichel
parent
39bb32f06c
commit
5c2141f2c7
@@ -378,7 +378,6 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
|
||||
struct device *dev = kobj_to_dev(kobj);
|
||||
struct power_supply *psy = dev_get_drvdata(dev);
|
||||
umode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
|
||||
int i;
|
||||
|
||||
if (!power_supply_attrs[attrno].prop_name)
|
||||
return 0;
|
||||
@@ -386,19 +385,11 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
|
||||
if (attrno == POWER_SUPPLY_PROP_TYPE)
|
||||
return mode;
|
||||
|
||||
for (i = 0; i < psy->desc->num_properties; i++) {
|
||||
int property = psy->desc->properties[i];
|
||||
|
||||
if (property == attrno) {
|
||||
if (power_supply_property_is_writeable(psy, property) > 0)
|
||||
mode |= S_IWUSR;
|
||||
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
|
||||
if (power_supply_battery_info_has_prop(psy->battery_info, attrno))
|
||||
if (power_supply_has_property(psy, attrno)) {
|
||||
if (power_supply_property_is_writeable(psy, attrno) > 0)
|
||||
mode |= S_IWUSR;
|
||||
return mode;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user