Hi,
On Sun, Mar 10, 2019 at 05:24:19PM +0100, Lubomir Rintel wrote:
> The power framework gained ability to register groups of sysfs
> attributes in commit cef8fe6a382c ("power: supply: core: add support for
> custom sysfs attributes").
>
> Signed-off-by: Lubomir Rintel <[email protected]>
> Suggested-by: Sebastian Reichel <[email protected]>
>
> ---Reviewed-by: Sebastian Reichel <[email protected]> -- Sebastian > Changes since v5: > - Added this patch > > drivers/power/supply/olpc_battery.c | 64 ++++++++++++++++------------- > 1 file changed, 35 insertions(+), 29 deletions(-) > > diff --git a/drivers/power/supply/olpc_battery.c > b/drivers/power/supply/olpc_battery.c > index 0d67158c13d6..c628d3a47e14 100644 > --- a/drivers/power/supply/olpc_battery.c > +++ b/drivers/power/supply/olpc_battery.c > @@ -551,7 +551,7 @@ static ssize_t olpc_bat_eeprom_read(struct file *filp, > struct kobject *kobj, > return count; > } > > -static const struct bin_attribute olpc_bat_eeprom = { > +static struct bin_attribute olpc_bat_eeprom = { > .attr = { > .name = "eeprom", > .mode = S_IRUGO, > @@ -575,7 +575,7 @@ static ssize_t olpc_bat_error_read(struct device *dev, > return sprintf(buf, "%d\n", ec_byte); > } > > -static const struct device_attribute olpc_bat_error = { > +static struct device_attribute olpc_bat_error = { > .attr = { > .name = "error", > .mode = S_IRUGO, > @@ -583,6 +583,27 @@ static const struct device_attribute olpc_bat_error = { > .show = olpc_bat_error_read, > }; > > +static struct attribute *olpc_bat_sysfs_attrs[] = { > + &olpc_bat_error.attr, > + NULL > +}; > + > +static struct bin_attribute *olpc_bat_sysfs_bin_attrs[] = { > + &olpc_bat_eeprom, > + NULL > +}; > + > +static const struct attribute_group olpc_bat_sysfs_group = { > + .attrs = olpc_bat_sysfs_attrs, > + .bin_attrs = olpc_bat_sysfs_bin_attrs, > + > +}; > + > +static const struct attribute_group *olpc_bat_sysfs_groups[] = { > + &olpc_bat_sysfs_group, > + NULL > +}; > + > /********************************************************************* > * Initialisation > *********************************************************************/ > @@ -615,7 +636,8 @@ static int olpc_battery_suspend(struct platform_device > *pdev, > > static int olpc_battery_probe(struct platform_device *pdev) > { > - struct power_supply_config psy_cfg = {}; > + struct power_supply_config bat_psy_cfg = {}; > + struct power_supply_config ac_psy_cfg = {}; > struct olpc_battery_data *data; > uint8_t status; > uint8_t ecver; > @@ -654,10 +676,11 @@ static int olpc_battery_probe(struct platform_device > *pdev) > > /* Ignore the status. It doesn't actually matter */ > > - psy_cfg.of_node = pdev->dev.of_node; > - psy_cfg.drv_data = data; > + ac_psy_cfg.of_node = pdev->dev.of_node; > + ac_psy_cfg.drv_data = data; > > - data->olpc_ac = devm_power_supply_register(&pdev->dev, &olpc_ac_desc, > &psy_cfg); > + data->olpc_ac = devm_power_supply_register(&pdev->dev, &olpc_ac_desc, > + &ac_psy_cfg); > if (IS_ERR(data->olpc_ac)) > return PTR_ERR(data->olpc_ac); > > @@ -671,37 +694,21 @@ static int olpc_battery_probe(struct platform_device > *pdev) > olpc_bat_desc.num_properties = ARRAY_SIZE(olpc_xo1_bat_props); > } > > - data->olpc_bat = devm_power_supply_register(&pdev->dev, &olpc_bat_desc, > &psy_cfg); > + bat_psy_cfg.of_node = pdev->dev.of_node; > + bat_psy_cfg.drv_data = data; > + bat_psy_cfg.attr_grp = olpc_bat_sysfs_groups; > + > + data->olpc_bat = devm_power_supply_register(&pdev->dev, &olpc_bat_desc, > + &bat_psy_cfg); > if (IS_ERR(data->olpc_bat)) > return PTR_ERR(data->olpc_bat); > > - ret = device_create_bin_file(&data->olpc_bat->dev, &olpc_bat_eeprom); > - if (ret) > - return ret; > - > - ret = device_create_file(&data->olpc_bat->dev, &olpc_bat_error); > - if (ret) > - goto error_failed; > - > if (olpc_ec_wakeup_available()) { > device_set_wakeup_capable(&data->olpc_ac->dev, true); > device_set_wakeup_capable(&data->olpc_bat->dev, true); > } > > return 0; > - > -error_failed: > - device_remove_bin_file(&data->olpc_bat->dev, &olpc_bat_eeprom); > - return ret; > -} > - > -static int olpc_battery_remove(struct platform_device *pdev) > -{ > - struct olpc_battery_data *data = platform_get_drvdata(pdev); > - > - device_remove_file(&data->olpc_bat->dev, &olpc_bat_error); > - device_remove_bin_file(&data->olpc_bat->dev, &olpc_bat_eeprom); > - return 0; > } > > static const struct of_device_id olpc_battery_ids[] = { > @@ -717,7 +724,6 @@ static struct platform_driver olpc_battery_driver = { > .of_match_table = olpc_battery_ids, > }, > .probe = olpc_battery_probe, > - .remove = olpc_battery_remove, > .suspend = olpc_battery_suspend, > }; > > -- > 2.20.1 >
signature.asc
Description: PGP signature
