Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...

[deliverable/linux.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ec8184d53f131338ddb159b48eb89f7b47e3e077..db320e8fa865f96c0742777403baab9ac4c218a8 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2508,33 +2508,6 @@ int regulator_is_enabled(struct regulator *regulator)
 }
 EXPORT_SYMBOL_GPL(regulator_is_enabled);
 
-/**
- * regulator_can_change_voltage - check if regulator can change voltage
- * @regulator: regulator source
- *
- * Returns positive if the regulator driver backing the source/client
- * can change its voltage, false otherwise. Useful for detecting fixed
- * or dummy regulators and disabling voltage change logic in the client
- * driver.
- */
-int regulator_can_change_voltage(struct regulator *regulator)
-{
-       struct regulator_dev    *rdev = regulator->rdev;
-
-       if (regulator_ops_is_valid(rdev, REGULATOR_CHANGE_VOLTAGE)) {
-               if (rdev->desc->n_voltages - rdev->desc->linear_min_sel > 1)
-                       return 1;
-
-               if (rdev->desc->continuous_voltage_range &&
-                   rdev->constraints->min_uV && rdev->constraints->max_uV &&
-                   rdev->constraints->min_uV != rdev->constraints->max_uV)
-                       return 1;
-       }
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(regulator_can_change_voltage);
-
 /**
  * regulator_count_voltages - count regulator_list_voltage() selectors
  * @regulator: regulator source