aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-17 18:06:18 +0100
committerMark Brown <broonie@kernel.org>2016-05-17 18:06:18 +0100
commitec4c436652cfdf5dcad60f553020ee99596b937b (patch)
tree162426003ff7ae8e858a967a4fa32bae3737d433 /include/linux/regulator
parentMerge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next (diff)
downloadlinux-dev-ec4c436652cfdf5dcad60f553020ee99596b937b.tar.xz
linux-dev-ec4c436652cfdf5dcad60f553020ee99596b937b.zip
regulator: Silence build warnings from regulator_can_change_voltage()
Cut down on noise for mainstream users of the API and people doing build testing by dropping the deprecated flag from regulator_can_change_voltage() as it triggers even on the EXPORT_SYMBOL_GPL() which affects all builds rather than just the remaining drivers with calls to it (for which fixes are currently pending). The function remains deprecated and is expected to be removed entirely in v4.8. Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/consumer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 80dc4e51d14a..48603506f8de 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -224,7 +224,7 @@ int regulator_bulk_force_disable(int num_consumers,
void regulator_bulk_free(int num_consumers,
struct regulator_bulk_data *consumers);
-int __deprecated regulator_can_change_voltage(struct regulator *regulator);
+int regulator_can_change_voltage(struct regulator *regulator);
int regulator_count_voltages(struct regulator *regulator);
int regulator_list_voltage(struct regulator *regulator, unsigned selector);
int regulator_is_supported_voltage(struct regulator *regulator,
@@ -436,7 +436,7 @@ static inline void regulator_bulk_free(int num_consumers,
{
}
-static inline int __deprecated regulator_can_change_voltage(struct regulator *regulator)
+static inline int regulator_can_change_voltage(struct regulator *regulator)
{
return 0;
}