summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:37 +0100
committerMark Brown <broonie@sirena.org.uk>2013-04-28 02:13:37 +0100
commit0e340ce1ddcf41ca435ef695ef004a6f587c749e (patch)
tree9f4cc87138ecf29762e1037a8c028c6ddd3ebc03 /include/linux
parent97844ede9487fc7c4689ce1499bbaa10312618be (diff)
parent020501f1a0911af70873e4d3d122b2e1889ccd03 (diff)
downloadlinux-stable-0e340ce1ddcf41ca435ef695ef004a6f587c749e.tar.gz
linux-stable-0e340ce1ddcf41ca435ef695ef004a6f587c749e.tar.bz2
linux-stable-0e340ce1ddcf41ca435ef695ef004a6f587c749e.zip
Merge remote-tracking branch 'regulator/topic/core' into v3.9-rc8
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/regulator/consumer.h14
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);
void devm_regulator_put(struct regulator *regulator);
/* regulator output control and status */
-int regulator_enable(struct regulator *regulator);
+int __must_check regulator_enable(struct regulator *regulator);
int regulator_disable(struct regulator *regulator);
int regulator_force_disable(struct regulator *regulator);
int regulator_is_enabled(struct regulator *regulator);
int regulator_disable_deferred(struct regulator *regulator, int ms);
-int regulator_bulk_get(struct device *dev, int num_consumers,
- struct regulator_bulk_data *consumers);
-int devm_regulator_bulk_get(struct device *dev, int num_consumers,
- struct regulator_bulk_data *consumers);
-int regulator_bulk_enable(int num_consumers,
- struct regulator_bulk_data *consumers);
+int __must_check regulator_bulk_get(struct device *dev, int num_consumers,
+ struct regulator_bulk_data *consumers);
+int __must_check devm_regulator_bulk_get(struct device *dev, int num_consumers,
+ struct regulator_bulk_data *consumers);
+int __must_check regulator_bulk_enable(int num_consumers,
+ struct regulator_bulk_data *consumers);
int regulator_bulk_disable(int num_consumers,
struct regulator_bulk_data *consumers);
int regulator_bulk_force_disable(int num_consumers,