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

Commit cccf6ae5 authored by Anson Huang's avatar Anson Huang Committed by Rafael J. Wysocki
Browse files

cpufreq: imx6q: save one condition block for normal case of nvmem read



Put return value checks of calling imx6ul_opp_check_speed_grading()
into one block to save one condition block for normal case.

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 58ad4e61
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -405,9 +405,10 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
	if (of_machine_is_compatible("fsl,imx6ul") ||
	    of_machine_is_compatible("fsl,imx6ull")) {
		ret = imx6ul_opp_check_speed_grading(cpu_dev);
		if (ret) {
			if (ret == -EPROBE_DEFER)
				return ret;
		if (ret) {

			dev_err(cpu_dev, "failed to read ocotp: %d\n",
				ret);
			return ret;