diff options
author | Chanwoo Choi <cw00.choi@samsung.com> | 2021-04-08 07:13:09 +0300 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2021-04-08 07:13:09 +0300 |
commit | 75d1b0b6677054d9b3f0186d014daf461abca68c (patch) | |
tree | 0e782b3ba6d570726a529e06ceaccea8fde0777a /drivers/devfreq | |
parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
parent | 1224451bb6f938023dd7fa4e7ba43bfb185bc9e3 (diff) | |
download | linux-75d1b0b6677054d9b3f0186d014daf461abca68c.tar.xz |
Merge branch 'immutable-devfreq-v5.13-rc1' into devfreq-next
Diffstat (limited to 'drivers/devfreq')
-rw-r--r-- | drivers/devfreq/devfreq.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index bf3047896e41..b6d3e7db0b09 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -11,6 +11,7 @@ #include <linux/kmod.h> #include <linux/sched.h> #include <linux/debugfs.h> +#include <linux/devfreq_cooling.h> #include <linux/errno.h> #include <linux/err.h> #include <linux/init.h> @@ -935,6 +936,12 @@ struct devfreq *devfreq_add_device(struct device *dev, mutex_unlock(&devfreq_list_lock); + if (devfreq->profile->is_cooling_device) { + devfreq->cdev = devfreq_cooling_em_register(devfreq, NULL); + if (IS_ERR(devfreq->cdev)) + devfreq->cdev = NULL; + } + return devfreq; err_init: @@ -960,6 +967,8 @@ int devfreq_remove_device(struct devfreq *devfreq) if (!devfreq) return -EINVAL; + devfreq_cooling_unregister(devfreq->cdev); + if (devfreq->governor) { devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_STOP, NULL); |