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: Anson Huang <Anson.Huang@nxp.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Anson Huang 2018-11-26 02:59:48 +00:00 committed by Rafael J. Wysocki
parent 58ad4e6197
commit cccf6ae52d
1 changed files with 3 additions and 2 deletions

View File

@ -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 == -EPROBE_DEFER)
return ret;
if (ret) {
if (ret == -EPROBE_DEFER)
return ret;
dev_err(cpu_dev, "failed to read ocotp: %d\n",
ret);
return ret;