Commit 1c073f84 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 706a7415 5693d077

drivers/devfreq/devfreq.c

+6 −4
Original line number Diff line number Diff line
@@ -472,10 +472,11 @@ static void devfreq_monitor(struct work_struct *work) 
 * devfreq_monitor_start() - Start load monitoring of devfreq instance

 * @devfreq:	the devfreq instance.

 *

 * Helper function for starting devfreq device load monitoring. By

 * default delayed work based monitoring is supported. Function

 * to be called from governor in response to DEVFREQ_GOV_START

 * event when device is added to devfreq framework.

 * Helper function for starting devfreq device load monitoring. By default,

 * deferrable timer is used for load monitoring. But the users can change this

 * behavior using the "timer" type in devfreq_dev_profile. This function will be

 * called by devfreq governor in response to the DEVFREQ_GOV_START event

 * generated while adding a device to the devfreq framework.

 */

void devfreq_monitor_start(struct devfreq *devfreq)

{
@@ -763,6 +764,7 @@ static void devfreq_dev_release(struct device *dev) 
		dev_pm_opp_put_opp_table(devfreq->opp_table);



	mutex_destroy(&devfreq->lock);

	srcu_cleanup_notifier_head(&devfreq->transition_notifier_list);

	kfree(devfreq);

}

drivers/devfreq/imx-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/devfreq.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/pm_opp.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

drivers/devfreq/imx8m-ddrc.c

+1 −1
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
 * Copyright 2019 NXP

 */



#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/device.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/devfreq.h>

#include <linux/pm_opp.h>

drivers/devfreq/mtk-cci-devfreq.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/minmax.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm_opp.h>

#include <linux/regulator/consumer.h>

drivers/devfreq/tegra30-devfreq.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/io.h>

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/pm_opp.h>

#include <linux/reset.h>