diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-04-05 16:55:22 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-15 12:09:21 -0700 |
| commit | 7590f608aacba64c42edd5a8d9560264b049f403 (patch) | |
| tree | 86f3fa5543538fb82bc73192ea5b7ff7d1194142 /arch/arm/mach-omap2/voltage.c | |
| parent | 5e5651be29d8bd08d0cc2bc617c43acff95e2229 (diff) | |
OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain
Track current nominal voltage as part of struct voltagedomain instead
of omap_vdd_info, which will soon be removed.
Also renames field from curr_volt to nominal_volt.
No functional changes.
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/voltage.c')
| -rw-r--r-- | arch/arm/mach-omap2/voltage.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 4afb36883b25..1b39e68db355 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -81,16 +81,12 @@ ovdc_out: */ unsigned long omap_voltage_get_nom_volt(struct voltagedomain *voltdm) { - struct omap_vdd_info *vdd; - if (!voltdm || IS_ERR(voltdm)) { pr_warning("%s: VDD specified does not exist!\n", __func__); return 0; } - vdd = voltdm->vdd; - - return vdd->curr_volt; + return voltdm->nominal_volt; } /** |