The devfreq core code is able to register the devfreq device as a
cooling device if the 'is_cooling_device' flag is set in the profile.

Use this flag and remove the cooling device registering code.

Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org>
---
 drivers/gpu/drm/lima/lima_devfreq.c | 14 +-------------
 drivers/gpu/drm/lima/lima_devfreq.h |  2 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/lima/lima_devfreq.c 
b/drivers/gpu/drm/lima/lima_devfreq.c
index 5686ad4aaf7c..86aea1bdc4f4 100644
--- a/drivers/gpu/drm/lima/lima_devfreq.c
+++ b/drivers/gpu/drm/lima/lima_devfreq.c
@@ -7,7 +7,6 @@
  */
 #include <linux/clk.h>
 #include <linux/devfreq.h>
-#include <linux/devfreq_cooling.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_opp.h>
@@ -84,17 +83,13 @@ static struct devfreq_dev_profile lima_devfreq_profile = {
        .polling_ms = 50, /* ~3 frames */
        .target = lima_devfreq_target,
        .get_dev_status = lima_devfreq_get_dev_status,
+       .is_cooling_device = true,
 };
 
 void lima_devfreq_fini(struct lima_device *ldev)
 {
        struct lima_devfreq *devfreq = &ldev->devfreq;
 
-       if (devfreq->cooling) {
-               devfreq_cooling_unregister(devfreq->cooling);
-               devfreq->cooling = NULL;
-       }
-
        if (devfreq->devfreq) {
                devm_devfreq_remove_device(ldev->dev, devfreq->devfreq);
                devfreq->devfreq = NULL;
@@ -110,7 +105,6 @@ void lima_devfreq_fini(struct lima_device *ldev)
 
 int lima_devfreq_init(struct lima_device *ldev)
 {
-       struct thermal_cooling_device *cooling;
        struct device *dev = ldev->dev;
        struct opp_table *opp_table;
        struct devfreq *devfreq;
@@ -173,12 +167,6 @@ int lima_devfreq_init(struct lima_device *ldev)
 
        ldevfreq->devfreq = devfreq;
 
-       cooling = of_devfreq_cooling_register(dev->of_node, devfreq);
-       if (IS_ERR(cooling))
-               dev_info(dev, "Failed to register cooling device\n");
-       else
-               ldevfreq->cooling = cooling;
-
        return 0;
 
 err_fini:
diff --git a/drivers/gpu/drm/lima/lima_devfreq.h 
b/drivers/gpu/drm/lima/lima_devfreq.h
index 2d9b3008ce77..c43a2069e5d3 100644
--- a/drivers/gpu/drm/lima/lima_devfreq.h
+++ b/drivers/gpu/drm/lima/lima_devfreq.h
@@ -9,7 +9,6 @@
 
 struct devfreq;
 struct opp_table;
-struct thermal_cooling_device;
 
 struct lima_device;
 
@@ -17,7 +16,6 @@ struct lima_devfreq {
        struct devfreq *devfreq;
        struct opp_table *clkname_opp_table;
        struct opp_table *regulators_opp_table;
-       struct thermal_cooling_device *cooling;
 
        ktime_t busy_time;
        ktime_t idle_time;
-- 
2.17.1

Reply via email to