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

Commit 22597a49 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom-cpufreq: Register cpufreq driver in driver probe" into msm-4.9

parents 6e394ce7 072b57e6
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int msm_cpufreq_probe(struct platform_device *pdev)
	char clk_name[] = "cpu??_clk";
	char tbl_name[] = "qcom,cpufreq-table-??";
	struct clk *c;
	int cpu;
	int cpu, ret;
	struct cpufreq_frequency_table *ftbl;

	l2_clk = devm_clk_get(dev, "l2_clk");
@@ -431,7 +431,15 @@ static int msm_cpufreq_probe(struct platform_device *pdev)
		per_cpu(freq_table, cpu) = ftbl;
	}

	return 0;
	ret = register_pm_notifier(&msm_cpufreq_pm_notifier);
	if (ret)
		return ret;

	ret = cpufreq_register_driver(&msm_cpufreq_driver);
	if (ret)
		unregister_pm_notifier(&msm_cpufreq_pm_notifier);

	return ret;
}

static const struct of_device_id msm_cpufreq_match_table[] = {
@@ -467,8 +475,7 @@ static int __init msm_cpufreq_register(void)
		return rc;
	}

	register_pm_notifier(&msm_cpufreq_pm_notifier);
	return cpufreq_register_driver(&msm_cpufreq_driver);
	return 0;
}

subsys_initcall(msm_cpufreq_register);