Commit 6f88b5be authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-fix-can-change-voltage' of...

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()
parents 1eccc6e1 ec4c4366
...@@ -224,7 +224,7 @@ int regulator_bulk_force_disable(int num_consumers, ...@@ -224,7 +224,7 @@ int regulator_bulk_force_disable(int num_consumers,
void regulator_bulk_free(int num_consumers, void regulator_bulk_free(int num_consumers,
struct regulator_bulk_data *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_count_voltages(struct regulator *regulator);
int regulator_list_voltage(struct regulator *regulator, unsigned selector); int regulator_list_voltage(struct regulator *regulator, unsigned selector);
int regulator_is_supported_voltage(struct regulator *regulator, int regulator_is_supported_voltage(struct regulator *regulator,
...@@ -436,7 +436,7 @@ static inline void regulator_bulk_free(int num_consumers, ...@@ -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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment