PM / devfreq: rk3399_dmc: rename of_get_opp_table

[firefly-linux-kernel-4.4.55.git] / drivers / devfreq / rk3399_dmc.c

diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
index 9020bd3406ad7ca2961948b339fb03ee2c4b3795..98312f9b0d62ea6004b5918d012249c93bf342d8 100644 (file)
--- a/drivers/devfreq/rk3399_dmc.c
+++ b/drivers/devfreq/rk3399_dmc.c
@@ -337,8 +337,8 @@ err:
        return timing;
 }
 
-static int of_get_opp_table(struct device *dev,
-                           struct devfreq_dev_profile *devp)
+static int rk3399_dmcfreq_init_freq_table(struct device *dev,
+                                         struct devfreq_dev_profile *devp)
 {
        int count;
        int i = 0;
@@ -445,11 +445,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
         */
        if (dev_pm_opp_of_add_table(dev)) {
                dev_err(dev, "Invalid operating-points in device tree.\n");
-               rcu_read_unlock();
                return -EINVAL;
        }
 
-       if (of_get_opp_table(dev, devp))
+       if (rk3399_dmcfreq_init_freq_table(dev, devp))
                return -EFAULT;
 
        of_property_read_u32(np, "upthreshold",
@@ -461,7 +460,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
        data->volt = regulator_get_voltage(data->vdd_center);
 
        devp->initial_freq = data->rate;
-       data->devfreq = devfreq_add_device(dev, devp,
+       data->devfreq = devm_devfreq_add_device(dev, devp,
                                           "simple_ondemand",
                                           &data->ondemand_data);
        if (IS_ERR(data->devfreq))
@@ -477,23 +476,14 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int rk3399_dmcfreq_remove(struct platform_device *pdev)
-{
-       struct rk3399_dmcfreq *dmcfreq = platform_get_drvdata(pdev);
-
-       regulator_put(dmcfreq->vdd_center);
-
-       return 0;
-}
-
 static const struct of_device_id rk3399dmc_devfreq_of_match[] = {
        { .compatible = "rockchip,rk3399-dmc" },
        { },
 };
+MODULE_DEVICE_TABLE(of, rk3399dmc_devfreq_of_match);
 
 static struct platform_driver rk3399_dmcfreq_driver = {
        .probe  = rk3399_dmcfreq_probe,
-       .remove = rk3399_dmcfreq_remove,
        .driver = {
                .name   = "rk3399-dmc-freq",
                .pm     = &rk3399_dmcfreq_pm,