Skip to content

Commit 1c073f8

Browse files
committed
Merge tag 'devfreq-next-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux
Pull devfreq iupdates for v6.6 from Chanwoo Choi: "- Include correct DT header explicitly for imx-bus/imx8m-ddrc/ mtk-cci/tegra30 tegra drivers. - Reword the kernel-doc comment for devfreq_monitor_start() API using to specify the default timer as deferrable timer because devfreq core supports both delayed timer and deferrable timer according to devfreq device profile. - Add missing srcu_cleanup_notifier_head() when releasing devfreq device. srcu_init_notifier_head() allocates resources that need to be released with a srcu_cleanup_notifier_head() call." * tag 'devfreq-next-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: PM / devfreq: Fix leak in devfreq_dev_release() PM / devfreq: Reword the kernel-doc comment for devfreq_monitor_start() API PM / devfreq: Explicitly include correct DT includes
2 parents 706a741 + 5693d07 commit 1c073f8

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

drivers/devfreq/devfreq.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,11 @@ static void devfreq_monitor(struct work_struct *work)
472472
* devfreq_monitor_start() - Start load monitoring of devfreq instance
473473
* @devfreq: the devfreq instance.
474474
*
475-
* Helper function for starting devfreq device load monitoring. By
476-
* default delayed work based monitoring is supported. Function
477-
* to be called from governor in response to DEVFREQ_GOV_START
478-
* event when device is added to devfreq framework.
475+
* Helper function for starting devfreq device load monitoring. By default,
476+
* deferrable timer is used for load monitoring. But the users can change this
477+
* behavior using the "timer" type in devfreq_dev_profile. This function will be
478+
* called by devfreq governor in response to the DEVFREQ_GOV_START event
479+
* generated while adding a device to the devfreq framework.
479480
*/
480481
void devfreq_monitor_start(struct devfreq *devfreq)
481482
{
@@ -763,6 +764,7 @@ static void devfreq_dev_release(struct device *dev)
763764
dev_pm_opp_put_opp_table(devfreq->opp_table);
764765

765766
mutex_destroy(&devfreq->lock);
767+
srcu_cleanup_notifier_head(&devfreq->transition_notifier_list);
766768
kfree(devfreq);
767769
}
768770

drivers/devfreq/imx-bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <linux/devfreq.h>
88
#include <linux/device.h>
99
#include <linux/module.h>
10-
#include <linux/of_device.h>
10+
#include <linux/of.h>
1111
#include <linux/pm_opp.h>
1212
#include <linux/platform_device.h>
1313
#include <linux/slab.h>

drivers/devfreq/imx8m-ddrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright 2019 NXP
44
*/
55

6+
#include <linux/mod_devicetable.h>
67
#include <linux/module.h>
78
#include <linux/device.h>
8-
#include <linux/of_device.h>
99
#include <linux/platform_device.h>
1010
#include <linux/devfreq.h>
1111
#include <linux/pm_opp.h>

drivers/devfreq/mtk-cci-devfreq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <linux/minmax.h>
99
#include <linux/module.h>
1010
#include <linux/of.h>
11-
#include <linux/of_device.h>
1211
#include <linux/platform_device.h>
1312
#include <linux/pm_opp.h>
1413
#include <linux/regulator/consumer.h>

drivers/devfreq/tegra30-devfreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <linux/io.h>
1414
#include <linux/irq.h>
1515
#include <linux/module.h>
16-
#include <linux/of_device.h>
16+
#include <linux/of.h>
1717
#include <linux/platform_device.h>
1818
#include <linux/pm_opp.h>
1919
#include <linux/reset.h>

0 commit comments

Comments
 (0)