summaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-01-29 17:52:37 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-29 21:29:45 +0000
commit2950c4bbf397fc7d3d778a97c32bba0e955b47fe (patch)
treeab093238fa1c94f163b387378cc6da55a68b2944 /include/linux/regulator
parente24abd6ec6c2dabccb825dc41d1725bc496b3a54 (diff)
regulator: Add devm_regulator_put in consumer.h
Commit d5ad34f7cb "regulator: Implement devm_regulator_free()" actually implements devm_regulator_put. Thus rename devm_regulator_free to devm_regulator_put. Also add empty devm_regulator_put for !CONFIG_REGULATOR Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/consumer.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index cef8f04efc3..b6c8d717c7e 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -137,7 +137,7 @@ struct regulator *__must_check devm_regulator_get(struct device *dev,
struct regulator *__must_check regulator_get_exclusive(struct device *dev,
const char *id);
void regulator_put(struct regulator *regulator);
-void devm_regulator_free(struct regulator *regulator);
+void devm_regulator_put(struct regulator *regulator);
/* regulator output control and status */
int regulator_enable(struct regulator *regulator);
@@ -216,6 +216,10 @@ static inline void regulator_put(struct regulator *regulator)
{
}
+static inline void devm_regulator_put(struct regulator *regulator)
+{
+}
+
static inline int regulator_enable(struct regulator *regulator)
{
return 0;