[PATCH] regulator: Add empty devm_regulator_free for !CONFIG_REGULATOR

[PATCH] regulator: Add empty devm_regulator_free for !CONFIG_REGULATOR

[Axel Lin]

So we don't have to add #ifdef CONFIG_REGULATOR guards for all the callers of
devm_regulator_free.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 include/linux/regulator/consumer.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index cef8f04..ad4eae8 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -216,6 +216,10 @@ static inline void regulator_put(struct regulator *regulator)
 {
 }
 
+static inline void devm_regulator_free(struct regulator *regulator)
+{
+}
+
 static inline int regulator_enable(struct regulator *regulator)
 {
 	return 0;
-- 
1.7.5.4

Re: [PATCH] regulator: Add empty devm_regulator_free for !CONFIG_REGULATOR

[Axel Lin]

> +static inline void devm_regulator_free(struct regulator *regulator)
> +{
> +}
> +

Oh wait.
I found commit d5ad34f7cb "regulator: Implement devm_regulator_free()"
has declared devm_regulator_free in include/linux/regulator/consumer.h
But it actually implements devm_regulator_put instead of devm_regulator_free.

Mark, I guess what you want is to declare devm_regulator_put instead
of devm_regulator_free
in consumer.h.

Regards,
Axel
>  static inline int regulator_enable(struct regulator *regulator)
>  {
>        return 0;
> --
> 1.7.5.4
>
>
>

Re: [PATCH] regulator: Add empty devm_regulator_free for !CONFIG_REGULATOR

[Mark Brown]

On Sun, Jan 29, 2012 at 05:42:51PM +0800, Axel Lin wrote:

> Mark, I guess what you want is to declare devm_regulator_put instead
> of devm_regulator_free
> in consumer.h.

Yes, indeed - put to match the get.