From 5d8a4219a0795a321606c51582898223db80e874 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 24 Feb 2015 15:33:50 +1100
Subject: [PATCH] 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>
---
drivers/power/power_supply_core.c | 45 +++++++++++++++++++++++++++++++
include/linux/power_supply.h | 4 +++
2 files changed, 49 insertions(+)
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 694e8cddd5c1..44c810456212 100644
--- 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 096dbced02ac..f606d6b4bd56 100644
--- 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);