power_supply core: support use of devres to register/unregister a power supply.

Using devm_power_supply_register allows the unregister to happen
automatically on error or final put.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 694e8cddd5c13e1760e7c9cd5fc0170876a9df04..44c810456212a07e1a0595f426f896583b8762b7 100644 (file)
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -617,6 +617,51 @@ int power_supply_register_no_ws(struct device *parent, struct power_supply *psy)
 }
 EXPORT_SYMBOL_GPL(power_supply_register_no_ws);
 
+static void devm_power_supply_release(struct device *dev, void *res)
+{
+       struct power_supply **psy = res;
+
+       power_supply_unregister(*psy);
+}
+
+int devm_power_supply_register(struct device *parent, struct power_supply *psy)
+{
+       struct power_supply **ptr = devres_alloc(devm_power_supply_release,
+                                                sizeof(*ptr), GFP_KERNEL);
+       int ret;
+
+       if (!ptr)
+               return -ENOMEM;
+       ret = __power_supply_register(parent, psy, true);
+       if (ret < 0)
+               devres_free(ptr);
+       else {
+               *ptr = psy;
+               devres_add(parent, ptr);
+       }
+       return ret;
+}
+EXPORT_SYMBOL_GPL(devm_power_supply_register);
+
+int devm_power_supply_register_no_ws(struct device *parent, struct power_supply *psy)
+{
+       struct power_supply **ptr = devres_alloc(devm_power_supply_release,
+                                                sizeof(*ptr), GFP_KERNEL);
+       int ret;
+
+       if (!ptr)
+               return -ENOMEM;
+       ret = __power_supply_register(parent, psy, false);
+       if (ret < 0)
+               devres_free(ptr);
+       else {
+               *ptr = psy;
+               devres_add(parent, ptr);
+       }
+       return ret;
+}
+EXPORT_SYMBOL_GPL(devm_power_supply_register_no_ws);
+
 void power_supply_unregister(struct power_supply *psy)
 {
        cancel_work_sync(&psy->changed_work);

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 096dbced02ac4b7cb9d18de6a8aa65e0592d78e9..f606d6b4bd562808d0cc9ec0eb9c042fc0ea4aa2 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -278,6 +278,10 @@ extern int power_supply_register(struct device *parent,
                                 struct power_supply *psy);
 extern int power_supply_register_no_ws(struct device *parent,
                                 struct power_supply *psy);
+extern int devm_power_supply_register(struct device *parent,
+                                struct power_supply *psy);
+extern int devm_power_supply_register_no_ws(struct device *parent,
+                                struct power_supply *psy);
 extern void power_supply_unregister(struct power_supply *psy);
 extern int power_supply_powers(struct power_supply *psy, struct device *dev);