From: NeilBrown <neilb@suse.de>
To: Samuel Ortiz <sameo@linux.intel.com>,
Tony Lindgren <tony@atomide.com>,
Lee Jones <lee.jones@linaro.org>,
Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>
Cc: GTA04 owners <gta04-owner@goldelico.com>,
linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [PATCH 01/15] power_supply core: support use of devres to register/unregister a power supply.
Date: Tue, 24 Feb 2015 15:33:50 +1100 [thread overview]
Message-ID: <20150224043350.4243.92949.stgit@notabene.brown> (raw)
In-Reply-To: <20150224043341.4243.23291.stgit@notabene.brown>
Using devm_power_supply_register allows the unregister to happen
automatically on error or final put.
Signed-off-by: NeilBrown <neilb@suse.de>
---
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);
next prev parent reply other threads:[~2015-02-24 4:35 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 4:33 [PATCH 00/15] Enhance twl4030_charger functionality NeilBrown
2015-02-24 4:33 ` [PATCH 02/15] twl4030_charger: use devm_request_threaded_irq NeilBrown
2015-02-24 4:33 ` [PATCH 03/15] twl4030_charger: use devres for power_supply_register and kzalloc NeilBrown
2015-03-07 20:25 ` Sebastian Reichel
2015-02-24 4:33 ` NeilBrown [this message]
2015-02-26 2:25 ` [PATCH 01/15] power_supply core: support use of devres to register/unregister a power supply Sebastian Reichel
2015-02-24 4:33 ` [PATCH 06/15] twl4030_charger: split uA calculation into a function NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-04 9:20 ` NeilBrown
2015-02-24 4:33 ` [PATCH 07/15] twl4030_charger: allow fine control of charger current NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-04 6:47 ` NeilBrown
2015-03-04 10:24 ` Pavel Machek
2015-03-07 20:32 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 08/15] twl4030_charger: distinguish between USB current and 'AC' current NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-04 6:53 ` NeilBrown
2015-02-24 4:33 ` [PATCH 05/15] twl4030_charger: trust phy to determine when USB power is available NeilBrown
2015-02-24 4:33 ` [PATCH 04/15] twl4030_charger: use runtime_pm to keep usb phy active while charging NeilBrown
2015-02-25 7:24 ` Lee Jones
2015-03-05 5:48 ` NeilBrown
2015-02-24 4:33 ` [PATCH 11/15] twl4030_charger: enable manual enable/disable of usb charging NeilBrown
2015-03-02 21:03 ` Pavel Machek
2015-03-04 6:15 ` NeilBrown
2015-03-04 10:19 ` Pavel Machek
2015-02-24 4:33 ` [PATCH 12/15] twl4030_charger: add software controlled linear charging mode NeilBrown
2015-03-02 21:09 ` Pavel Machek
2015-03-05 6:33 ` NeilBrown
2015-03-06 21:24 ` twl4030_charger: need changes to get probed? Pavel Machek
2015-03-06 21:57 ` Pali Rohár
2015-03-06 22:12 ` Grazvydas Ignotas
2015-03-06 22:40 ` Pavel Machek
2015-03-06 22:56 ` Pali Rohár
2015-03-07 15:56 ` Grazvydas Ignotas
2015-03-07 16:43 ` Pali Rohár
2015-04-26 10:13 ` Pavel Machek
2015-03-07 21:01 ` Sebastian Reichel
2015-03-09 0:06 ` NeilBrown
2015-03-09 11:14 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 09/15] twl4030_charger: allow max_current to be managed via sysfs NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-03-05 6:26 ` NeilBrown
2015-03-05 8:17 ` Pavel Machek
2015-03-07 20:37 ` Sebastian Reichel
2015-02-24 4:33 ` [PATCH 10/15] twl4030_charger: only draw USB current as negotiated with host NeilBrown
2015-03-02 21:05 ` Pavel Machek
2015-02-24 4:33 ` [PATCH 14/15] twl4030_charger: Increase current carefully while watching voltage NeilBrown
2015-03-02 21:29 ` Pavel Machek
2015-03-05 6:51 ` NeilBrown
2015-02-24 4:33 ` [PATCH 13/15] twl4030_charger: add ac/mode to match usb/mode NeilBrown
2015-03-02 21:13 ` Pavel Machek
2015-03-06 21:59 ` Grazvydas Ignotas
2015-03-22 23:13 ` NeilBrown
2015-02-24 4:33 ` [PATCH 15/15] twl4030_charger: assume a 'charger' can supply maximum current NeilBrown
2015-03-02 21:29 ` Pavel Machek
2015-03-05 6:45 ` NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150224043350.4243.92949.stgit@notabene.brown \
--to=neilb@suse.de \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=gta04-owner@goldelico.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sre@kernel.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).