diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:17 +0100 |
| commit | f27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (patch) | |
| tree | a6bc4d322341ee1211657302f41614b52572b207 /include/linux/regulator | |
| parent | Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next (diff) | |
| parent | regulator: Add devm_regulator_get_exclusive() (diff) | |
| download | linux-dev-f27a5fb424d4897edd3c7735ecf054ee57a5dbd0.tar.xz linux-dev-f27a5fb424d4897edd3c7735ecf054ee57a5dbd0.zip | |
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/consumer.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 3610df8dd229..27be915caa96 100644 --- 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) { } |