projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regulator: Use _regulator_get_voltage() consistently
[deliverable/linux.git]
/
drivers
/
regulator
/
core.c
diff --git
a/drivers/regulator/core.c
b/drivers/regulator/core.c
index 5d07e5dd417f858f121524b1666004737c0cc20f..671eb53b5cdc1a1125abc36712923c56ee785bdb 100644
(file)
--- a/
drivers/regulator/core.c
+++ b/
drivers/regulator/core.c
@@
-581,14
+581,15
@@
static void drms_uA_update(struct regulator_dev *rdev)
return;
/* get output voltage */
return;
/* get output voltage */
- output_uV =
rdev->desc->ops->
get_voltage(rdev);
+ output_uV =
_regulator_
get_voltage(rdev);
if (output_uV <= 0)
return;
/* get input voltage */
if (output_uV <= 0)
return;
/* get input voltage */
- if (rdev->supply && rdev->supply->desc->ops->get_voltage)
- input_uV = rdev->supply->desc->ops->get_voltage(rdev->supply);
- else
+ input_uV = 0;
+ if (rdev->supply)
+ input_uV = _regulator_get_voltage(rdev);
+ if (input_uV <= 0)
input_uV = rdev->constraints->input_uV;
if (input_uV <= 0)
return;
input_uV = rdev->constraints->input_uV;
if (input_uV <= 0)
return;
@@
-1908,16
+1909,17
@@
int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
goto out;
/* get output voltage */
goto out;
/* get output voltage */
- output_uV =
rdev->desc->ops->
get_voltage(rdev);
+ output_uV =
_regulator_
get_voltage(rdev);
if (output_uV <= 0) {
rdev_err(rdev, "invalid output voltage found\n");
goto out;
}
/* get input voltage */
if (output_uV <= 0) {
rdev_err(rdev, "invalid output voltage found\n");
goto out;
}
/* get input voltage */
- if (rdev->supply && rdev->supply->desc->ops->get_voltage)
- input_uV = rdev->supply->desc->ops->get_voltage(rdev->supply);
- else
+ input_uV = 0;
+ if (rdev->supply)
+ input_uV = _regulator_get_voltage(rdev->supply);
+ if (input_uV <= 0)
input_uV = rdev->constraints->input_uV;
if (input_uV <= 0) {
rdev_err(rdev, "invalid input voltage found\n");
input_uV = rdev->constraints->input_uV;
if (input_uV <= 0) {
rdev_err(rdev, "invalid input voltage found\n");
This page took
0.037876 seconds
and
5
git commands to generate.