Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52149e0 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'v3.18/topic/OPPv2' into linux-linaro-lsk-v3.18

parents e0ac66e0 a0c4cbd7
Loading
Loading
Loading
Loading
+0 −16
Original line number Diff line number Diff line
@@ -964,22 +964,6 @@ static struct dev_pm_opp *_allocate_opp(struct device *dev,
	return opp;
}

static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,
					 struct device_opp *dev_opp)
{
	struct regulator *reg = dev_opp->regulator;

	if (!IS_ERR(reg) &&
	    !regulator_is_supported_voltage(reg, opp->u_volt_min,
					    opp->u_volt_max)) {
		pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n",
			__func__, opp->u_volt_min, opp->u_volt_max);
		return false;
	}

	return true;
}

static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
		    struct device_opp *dev_opp)
{