Commit a942f913 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Sebastian Reichel

power: supply: core: Simplify hwmon memory allocation

Use devm_bitmap_zalloc() instead of hand writing it.
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent f059b46e
...@@ -324,11 +324,6 @@ static const struct hwmon_chip_info power_supply_hwmon_chip_info = { ...@@ -324,11 +324,6 @@ static const struct hwmon_chip_info power_supply_hwmon_chip_info = {
.info = power_supply_hwmon_info, .info = power_supply_hwmon_info,
}; };
static void power_supply_hwmon_bitmap_free(void *data)
{
bitmap_free(data);
}
int power_supply_add_hwmon_sysfs(struct power_supply *psy) int power_supply_add_hwmon_sysfs(struct power_supply *psy)
{ {
const struct power_supply_desc *desc = psy->desc; const struct power_supply_desc *desc = psy->desc;
...@@ -349,18 +344,14 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy) ...@@ -349,18 +344,14 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy)
} }
psyhw->psy = psy; psyhw->psy = psy;
psyhw->props = bitmap_zalloc(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG + 1, psyhw->props = devm_bitmap_zalloc(dev,
POWER_SUPPLY_PROP_TIME_TO_FULL_AVG + 1,
GFP_KERNEL); GFP_KERNEL);
if (!psyhw->props) { if (!psyhw->props) {
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
} }
ret = devm_add_action_or_reset(dev, power_supply_hwmon_bitmap_free,
psyhw->props);
if (ret)
goto error;
for (i = 0; i < desc->num_properties; i++) { for (i = 0; i < desc->num_properties; i++) {
const enum power_supply_property prop = desc->properties[i]; const enum power_supply_property prop = desc->properties[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment