diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:37 -0400 |
| commit | 0e340ce1ddcf41ca435ef695ef004a6f587c749e (patch) | |
| tree | 9f4cc87138ecf29762e1037a8c028c6ddd3ebc03 /include | |
| parent | 97844ede9487fc7c4689ce1499bbaa10312618be (diff) | |
| parent | 020501f1a0911af70873e4d3d122b2e1889ccd03 (diff) | |
Merge remote-tracking branch 'regulator/topic/core' into v3.9-rc8
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/consumer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 7bc732ce6e50..145022a83085 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h | |||
| @@ -141,18 +141,18 @@ void regulator_put(struct regulator *regulator); | |||
| 141 | void devm_regulator_put(struct regulator *regulator); | 141 | void devm_regulator_put(struct regulator *regulator); |
| 142 | 142 | ||
| 143 | /* regulator output control and status */ | 143 | /* regulator output control and status */ |
| 144 | int regulator_enable(struct regulator *regulator); | 144 | int __must_check regulator_enable(struct regulator *regulator); |
| 145 | int regulator_disable(struct regulator *regulator); | 145 | int regulator_disable(struct regulator *regulator); |
| 146 | int regulator_force_disable(struct regulator *regulator); | 146 | int regulator_force_disable(struct regulator *regulator); |
| 147 | int regulator_is_enabled(struct regulator *regulator); | 147 | int regulator_is_enabled(struct regulator *regulator); |
| 148 | int regulator_disable_deferred(struct regulator *regulator, int ms); | 148 | int regulator_disable_deferred(struct regulator *regulator, int ms); |
| 149 | 149 | ||
| 150 | int regulator_bulk_get(struct device *dev, int num_consumers, | 150 | int __must_check regulator_bulk_get(struct device *dev, int num_consumers, |
| 151 | struct regulator_bulk_data *consumers); | 151 | struct regulator_bulk_data *consumers); |
| 152 | int devm_regulator_bulk_get(struct device *dev, int num_consumers, | 152 | int __must_check devm_regulator_bulk_get(struct device *dev, int num_consumers, |
| 153 | struct regulator_bulk_data *consumers); | 153 | struct regulator_bulk_data *consumers); |
| 154 | int regulator_bulk_enable(int num_consumers, | 154 | int __must_check regulator_bulk_enable(int num_consumers, |
| 155 | struct regulator_bulk_data *consumers); | 155 | struct regulator_bulk_data *consumers); |
| 156 | int regulator_bulk_disable(int num_consumers, | 156 | int regulator_bulk_disable(int num_consumers, |
| 157 | struct regulator_bulk_data *consumers); | 157 | struct regulator_bulk_data *consumers); |
| 158 | int regulator_bulk_force_disable(int num_consumers, | 158 | int regulator_bulk_force_disable(int num_consumers, |