Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

[firefly-linux-kernel-4.4.55.git] / include / linux / regulator / consumer.h

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 3610df8dd229fae5ef7a82aaa48ca0b976bf4d68..27be915caa96465ebfe7068a3af499e976a0ddc1 100644 (file)
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -137,6 +137,12 @@ struct regulator *__must_check devm_regulator_get(struct device *dev,
                                             const char *id);
 struct regulator *__must_check regulator_get_exclusive(struct device *dev,
                                                       const char *id);
+struct regulator *__must_check devm_regulator_get_exclusive(struct device *dev,
+                                                       const char *id);
+struct regulator *__must_check regulator_get_optional(struct device *dev,
+                                                     const char *id);
+struct regulator *__must_check devm_regulator_get_optional(struct device *dev,
+                                                          const char *id);
 void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 
@@ -217,6 +223,25 @@ devm_regulator_get(struct device *dev, const char *id)
        return NULL;
 }
 
+static inline struct regulator *__must_check
+regulator_get_exclusive(struct device *dev, const char *id)
+{
+       return NULL;
+}
+
+static inline struct regulator *__must_check
+regulator_get_optional(struct device *dev, const char *id)
+{
+       return NULL;
+}
+
+
+static inline struct regulator *__must_check
+devm_regulator_get_optional(struct device *dev, const char *id)
+{
+       return NULL;
+}
+
 static inline void regulator_put(struct regulator *regulator)
 {
 }