regulator: Add devm_regulator_put in consumer.h
authorAxel Lin <axel.lin@gmail.com>
Sun, 29 Jan 2012 09:52:37 +0000 (17:52 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 29 Jan 2012 21:29:45 +0000 (21:29 +0000)
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>
include/linux/regulator/consumer.h

index cef8f04efc34dcf3ccb1ef1df909a482406cadc7..b6c8d717c7ecc4592e2d9abd4cc8206998146f48 100644 (file)
@@ -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);
 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);
 
 /* 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;
 static inline int regulator_enable(struct regulator *regulator)
 {
        return 0;