---

yaml
---
r: 272751
b: refs/heads/master
c: cc6962d
h: refs/heads/master
i:
  272749: c550343
  272747: c70c95c
  272743: ad475bd
  272735: a02a421
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8798c4ab56d8f726092870cb2cf15c5a7a0a93bf
+refs/heads/master: cc6962dbab223ae51b47c8057d39d89ac6af0d35

trunk/arch/arm/mach-omap2/vp.c

@@ -208,40 +208,6 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
 	return 0;
 }
 
-/**
- * omap_vp_get_curr_volt() - API to get the current vp voltage.
- * @voltdm:	pointer to the VDD.
- *
- * This API returns the current voltage for the specified voltage processor
- */
-unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm)
-{
-	struct omap_vp_instance *vp = voltdm->vp;
-	u8 curr_vsel;
-
-	if (!voltdm || IS_ERR(voltdm)) {
-		pr_warning("%s: VDD specified does not exist!\n", __func__);
-		return 0;
-	}
-
-	if (!voltdm->read) {
-		pr_err("%s: No read API for reading vdd_%s regs\n",
-			__func__, voltdm->name);
-		return 0;
-	}
-
-	curr_vsel = (voltdm->read(vp->voltage) & vp->common->vpvoltage_mask)
-		>> __ffs(vp->common->vpvoltage_mask);
-
-	if (!voltdm->pmic || !voltdm->pmic->vsel_to_uv) {
-		pr_warning("%s: PMIC function to convert vsel to voltage"
-			"in uV not registerd\n", __func__);
-		return 0;
-	}
-
-	return voltdm->pmic->vsel_to_uv(curr_vsel);
-}
-
 /**
  * omap_vp_enable() - API to enable a particular VP
  * @voltdm:	pointer to the VDD whose VP is to be enabled.

trunk/arch/arm/mach-omap2/vp.h

@@ -120,7 +120,6 @@ extern struct omap_vp_instance omap4_vp_core;
 void omap_vp_init(struct voltagedomain *voltdm);
 void omap_vp_enable(struct voltagedomain *voltdm);
 void omap_vp_disable(struct voltagedomain *voltdm);
-unsigned long omap_vp_get_curr_volt(struct voltagedomain *voltdm);
 int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
 			      unsigned long target_volt);
 int omap_vp_update_errorgain(struct voltagedomain *voltdm,