diff options
Diffstat (limited to 'arch/arm/mach-omap2/vp.c')
| -rw-r--r-- | arch/arm/mach-omap2/vp.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c index b5c3524..3f16be5 100644 --- a/arch/arm/mach-omap2/vp.c +++ b/arch/arm/mach-omap2/vp.c @@ -136,15 +136,11 @@ void omap_vp_clear_transdone(struct voltagedomain *voltdm) } int omap_vp_update_errorgain(struct voltagedomain *voltdm, - unsigned long target_volt) + struct omap_volt_data *volt_data) { - struct omap_volt_data *volt_data; - - /* Get volt_data corresponding to target_volt */ - volt_data = omap_voltage_get_voltdata(voltdm, target_volt); - if (IS_ERR(volt_data)) { - pr_err("%s: vdm %s no voltage data for %ld\n", __func__, - voltdm->name, target_volt); + if (IS_ERR_OR_NULL(volt_data)) { + pr_err("%s: vdm %s bad voltage data %p\n", __func__, + voltdm->name, volt_data); return -EINVAL; } @@ -203,7 +199,8 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm, "%s:vdd_%s idletimdout forceupdate(v=%ld)\n", __func__, voltdm->name, target_volt); - ret = omap_vc_pre_scale(voltdm, target_volt, &target_vsel, ¤t_vsel); + ret = omap_vc_pre_scale(voltdm, target_volt, target_v, + &target_vsel, ¤t_vsel); if (ret) return ret; |