lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulator: Add devm_regulator_put in consumer.h

Browse Source 
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>
This commit is contained in:
Axel Lin
2012-01-29 17:52:37 +08:00
committed by Mark Brown
parent e24abd6ec6
commit 2950c4bbf3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/regulator/consumer.h
View 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, struct regulator *__must_check regulator_get_exclusive(struct device *dev,
const char *id); const char *id);
void regulator_put(struct regulator *regulator); 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 */ /* regulator output control and status */
int regulator_enable(struct regulator *regulator); 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) static inline int regulator_enable(struct regulator *regulator)
{ {
return 0; return 0;