Skip to contentSkip to conversation

regulator: Add devm_regulator_put in consumer.h

PATCH Applied Axel Lin 2 participants 2 messages Jan 29, 2012 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 include/linux/regulator/consumer.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
include/linux/regulator/consumer.h +5 -1
index cef8f04..b6c8d71 100644
@@ -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;
Signature · 1 line
1.7.5.4
Applied
#1 lore raw
Quoted 3 lines · Axel Lin

Commit d5ad34f7cb "regulator: Implement devm_regulator_free()" actually implements devm_regulator_put.
Thus rename devm_regulator_free to devm_regulator_put.

Applied, thanks.