mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
PM / OPP: Rename opp init/free table routines
free-table routines are opposite of init-table ones, and must be named to make that clear. Opposite of 'init' is 'exit', but those doesn't suit really well. Replace 'init' with 'add' and 'free' with 'remove'. Reported-by: Pavel Machek <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Acked-by: Shawn Guo <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
This commit is contained in:
parent
1840995c52
commit
f0489a5ef4
9 changed files with 44 additions and 45 deletions
|
|
@ -28,7 +28,7 @@ struct cpufreq_arm_bL_ops {
|
|||
|
||||
/*
|
||||
* This must set opp table for cpu_dev in a similar way as done by
|
||||
* of_init_opp_table().
|
||||
* of_add_opp_table().
|
||||
*/
|
||||
int (*init_opp_table)(struct device *cpu_dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ static int dt_init_opp_table(struct device *cpu_dev)
|
|||
return -ENOENT;
|
||||
}
|
||||
|
||||
ret = of_init_opp_table(cpu_dev);
|
||||
ret = of_add_opp_table(cpu_dev);
|
||||
of_node_put(np);
|
||||
|
||||
return ret;
|
||||
|
|
@ -82,7 +82,7 @@ static struct cpufreq_arm_bL_ops dt_bL_ops = {
|
|||
.name = "dt-bl",
|
||||
.get_transition_latency = dt_get_transition_latency,
|
||||
.init_opp_table = dt_init_opp_table,
|
||||
.free_opp_table = of_free_opp_table,
|
||||
.free_opp_table = of_remove_opp_table,
|
||||
};
|
||||
|
||||
static int generic_bL_probe(struct platform_device *pdev)
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
|||
*
|
||||
* OPPs might be populated at runtime, don't check for error here
|
||||
*/
|
||||
of_cpumask_init_opp_table(policy->cpus);
|
||||
of_cpumask_add_opp_table(policy->cpus);
|
||||
|
||||
/*
|
||||
* But we need OPP table to function so if it is not there let's
|
||||
|
|
@ -368,7 +368,7 @@ out_free_cpufreq_table:
|
|||
out_free_priv:
|
||||
kfree(priv);
|
||||
out_free_opp:
|
||||
of_cpumask_free_opp_table(policy->cpus);
|
||||
of_cpumask_remove_opp_table(policy->cpus);
|
||||
out_node_put:
|
||||
of_node_put(np);
|
||||
out_put_reg_clk:
|
||||
|
|
@ -385,7 +385,7 @@ static int cpufreq_exit(struct cpufreq_policy *policy)
|
|||
|
||||
cpufreq_cooling_unregister(priv->cdev);
|
||||
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
|
||||
of_cpumask_free_opp_table(policy->related_cpus);
|
||||
of_cpumask_remove_opp_table(policy->related_cpus);
|
||||
clk_put(policy->clk);
|
||||
if (!IS_ERR(priv->cpu_reg))
|
||||
regulator_put(priv->cpu_reg);
|
||||
|
|
|
|||
|
|
@ -360,7 +360,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
|
|||
goto err_put_node;
|
||||
}
|
||||
|
||||
ret = of_init_opp_table(dvfs_info->dev);
|
||||
ret = of_add_opp_table(dvfs_info->dev);
|
||||
if (ret) {
|
||||
dev_err(dvfs_info->dev, "failed to init OPP table: %d\n", ret);
|
||||
goto err_put_node;
|
||||
|
|
@ -424,7 +424,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
|
|||
err_free_table:
|
||||
dev_pm_opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table);
|
||||
err_free_opp:
|
||||
of_free_opp_table(dvfs_info->dev);
|
||||
of_remove_opp_table(dvfs_info->dev);
|
||||
err_put_node:
|
||||
of_node_put(np);
|
||||
dev_err(&pdev->dev, "%s: failed initialization\n", __func__);
|
||||
|
|
@ -435,7 +435,7 @@ static int exynos_cpufreq_remove(struct platform_device *pdev)
|
|||
{
|
||||
cpufreq_unregister_driver(&exynos_driver);
|
||||
dev_pm_opp_free_cpufreq_table(dvfs_info->dev, &dvfs_info->freq_table);
|
||||
of_free_opp_table(dvfs_info->dev);
|
||||
of_remove_opp_table(dvfs_info->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev)
|
|||
*/
|
||||
num = dev_pm_opp_get_opp_count(cpu_dev);
|
||||
if (num < 0) {
|
||||
ret = of_init_opp_table(cpu_dev);
|
||||
ret = of_add_opp_table(cpu_dev);
|
||||
if (ret < 0) {
|
||||
dev_err(cpu_dev, "failed to init OPP table: %d\n", ret);
|
||||
goto put_reg;
|
||||
|
|
@ -312,7 +312,7 @@ free_freq_table:
|
|||
dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
|
||||
out_free_opp:
|
||||
if (free_opp)
|
||||
of_free_opp_table(cpu_dev);
|
||||
of_remove_opp_table(cpu_dev);
|
||||
put_reg:
|
||||
if (!IS_ERR(arm_reg))
|
||||
regulator_put(arm_reg);
|
||||
|
|
@ -340,7 +340,7 @@ static int imx6q_cpufreq_remove(struct platform_device *pdev)
|
|||
cpufreq_unregister_driver(&imx6q_cpufreq_driver);
|
||||
dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);
|
||||
if (free_opp)
|
||||
of_free_opp_table(cpu_dev);
|
||||
of_remove_opp_table(cpu_dev);
|
||||
regulator_put(arm_reg);
|
||||
if (!IS_ERR(pu_reg))
|
||||
regulator_put(pu_reg);
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
|
|||
/* Both presence and absence of sram regulator are valid cases. */
|
||||
sram_reg = regulator_get_exclusive(cpu_dev, "sram");
|
||||
|
||||
ret = of_init_opp_table(cpu_dev);
|
||||
ret = of_add_opp_table(cpu_dev);
|
||||
if (ret) {
|
||||
pr_warn("no OPP table for cpu%d\n", cpu);
|
||||
goto out_free_resources;
|
||||
|
|
@ -378,7 +378,7 @@ static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
|
|||
return 0;
|
||||
|
||||
out_free_opp_table:
|
||||
of_free_opp_table(cpu_dev);
|
||||
of_remove_opp_table(cpu_dev);
|
||||
|
||||
out_free_resources:
|
||||
if (!IS_ERR(proc_reg))
|
||||
|
|
@ -404,7 +404,7 @@ static void mtk_cpu_dvfs_info_release(struct mtk_cpu_dvfs_info *info)
|
|||
if (!IS_ERR(info->inter_clk))
|
||||
clk_put(info->inter_clk);
|
||||
|
||||
of_free_opp_table(info->cpu_dev);
|
||||
of_remove_opp_table(info->cpu_dev);
|
||||
}
|
||||
|
||||
static int mtk_cpufreq_init(struct cpufreq_policy *policy)
|
||||
|
|
|
|||
Loading…
Reference in a new issue