From: Mark Brown <broonie@linaro.org>
Date: Fri, 25 Jul 2014 18:07:11 +0000 (+0100)
Subject: regulator: Add missing statics and inlines for stub functions
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3bc0312e67f0be679039980291f88405f20b0a95;p=deliverable%2Flinux.git

regulator: Add missing statics and inlines for stub functions

So we don't get multiple definitions.

Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 0b1c8d09a6b1..d9e6c20ab9bb 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -460,20 +460,20 @@ static inline int regulator_allow_bypass(struct regulator *regulator,
 	return 0;
 }
 
-struct regmap *regulator_get_regmap(struct regulator *regulator)
+static inline struct regmap *regulator_get_regmap(struct regulator *regulator)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }
 
-int regulator_get_hardware_vsel_register(struct regulator *regulator,
-					 unsigned *vsel_reg,
-					 unsigned *vsel_mask)
+static inline int regulator_get_hardware_vsel_register(struct regulator *regulator,
+						       unsigned *vsel_reg,
+						       unsigned *vsel_mask)
 {
 	return -EOPNOTSUPP;
 }
 
-int regulator_list_hardware_vsel(struct regulator *regulator,
-				 unsigned selector)
+static inline int regulator_list_hardware_vsel(struct regulator *regulator,
+					       unsigned selector)
 {
 	return -EOPNOTSUPP;
 }