diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 17:47:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 17:47:31 -0700 |
| commit | 6f88b5be84985f751746d313b8d2a4e18494a602 (patch) | |
| tree | 8099415f3e03898729b73d657bded4ff42fc0be6 /include | |
| parent | 1eccc6e1529ec7ad1cebbd2c97ceb2a1a39f7d76 (diff) | |
| parent | ec4c436652cfdf5dcad60f553020ee99596b937b (diff) | |
Merge tag 'regulator-fix-can-change-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"Fix 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"
* tag 'regulator-fix-can-change-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: Silence build warnings from regulator_can_change_voltage()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/consumer.h | 4 |
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; } |