Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2950c4bb authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Add devm_regulator_put in consumer.h 



Commit d5ad34f7 "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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e24abd6e

include/linux/regulator/consumer.h

+5 −1
Original line number Diff line number Diff line
@@ -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;