power: supply: core: Simplify hwmon memory allocation

Use devm_bitmap_zalloc() instead of hand writing it.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
index bffe6d84c429cda2f6bcc42077e23c5da98e5577..a48aa4afb828dba652655db6cd4783f93a4e9d23 100644 (file)
--- a/drivers/power/supply/power_supply_hwmon.c
+++ b/drivers/power/supply/power_supply_hwmon.c
@@ -324,11 +324,6 @@ static const struct hwmon_chip_info power_supply_hwmon_chip_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)
 {
        const struct power_supply_desc *desc = psy->desc;
@@ -349,18 +344,14 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy)
        }
 
        psyhw->psy = psy;
-       psyhw->props = bitmap_zalloc(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG + 1,
-                                    GFP_KERNEL);
+       psyhw->props = devm_bitmap_zalloc(dev,
+                                         POWER_SUPPLY_PROP_TIME_TO_FULL_AVG + 1,
+                                         GFP_KERNEL);
        if (!psyhw->props) {
                ret = -ENOMEM;
                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++) {
                const enum power_supply_property prop = desc->properties[i];