Merge tag 'nfsd-4.4' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / arm_big_little_dt.c

diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c
index 36d91dba29652c7cbb33bb1a4e1d37bb1d37f628..16ddeefe94433a4edb369636131a4bd69912ccf7 100644 (file)
--- a/drivers/cpufreq/arm_big_little_dt.c
+++ b/drivers/cpufreq/arm_big_little_dt.c
@@ -54,7 +54,7 @@ static int dt_init_opp_table(struct device *cpu_dev)
                return -ENOENT;
        }
 
-       ret = of_init_opp_table(cpu_dev);
+       ret = dev_pm_opp_of_add_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 = dev_pm_opp_of_remove_table,
 };
 
 static int generic_bL_probe(struct platform_device *pdev)