Commit 58b11f67 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq 

Pull devfreq changes for v4.12 from MyungJoo Ham.

* 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: Move struct devfreq_governor to devfreq directory
parents 39da7c50 3ea6b700

drivers/devfreq/governor.h

+29 −0
Original line number Diff line number Diff line
@@ -25,6 +25,35 @@ 
#define DEVFREQ_GOV_SUSPEND			0x4

#define DEVFREQ_GOV_RESUME			0x5



/**

 * struct devfreq_governor - Devfreq policy governor

 * @node:		list node - contains registered devfreq governors

 * @name:		Governor's name

 * @immutable:		Immutable flag for governor. If the value is 1,

 *			this govenror is never changeable to other governor.

 * @get_target_freq:	Returns desired operating frequency for the device.

 *			Basically, get_target_freq will run

 *			devfreq_dev_profile.get_dev_status() to get the

 *			status of the device (load = busy_time / total_time).

 *			If no_central_polling is set, this callback is called

 *			only with update_devfreq() notified by OPP.

 * @event_handler:      Callback for devfreq core framework to notify events

 *                      to governors. Events include per device governor

 *                      init and exit, opp changes out of devfreq, suspend

 *                      and resume of per device devfreq during device idle.

 *

 * Note that the callbacks are called with devfreq->lock locked by devfreq.

 */

struct devfreq_governor {

	struct list_head node;



	const char name[DEVFREQ_NAME_LEN];

	const unsigned int immutable;

	int (*get_target_freq)(struct devfreq *this, unsigned long *freq);

	int (*event_handler)(struct devfreq *devfreq,

				unsigned int event, void *data);

};



/* Caution: devfreq->lock must be locked before calling update_devfreq */

extern int update_devfreq(struct devfreq *devfreq);

include/linux/devfreq.h

+1 −29
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define DEVFREQ_POSTCHANGE		(1)



struct devfreq;

struct devfreq_governor;



/**

 * struct devfreq_dev_status - Data given from devfreq user device to
@@ -100,35 +101,6 @@ struct devfreq_dev_profile { 
	unsigned int max_state;

};



/**

 * struct devfreq_governor - Devfreq policy governor

 * @node:		list node - contains registered devfreq governors

 * @name:		Governor's name

 * @immutable:		Immutable flag for governor. If the value is 1,

 *			this govenror is never changeable to other governor.

 * @get_target_freq:	Returns desired operating frequency for the device.

 *			Basically, get_target_freq will run

 *			devfreq_dev_profile.get_dev_status() to get the

 *			status of the device (load = busy_time / total_time).

 *			If no_central_polling is set, this callback is called

 *			only with update_devfreq() notified by OPP.

 * @event_handler:      Callback for devfreq core framework to notify events

 *                      to governors. Events include per device governor

 *                      init and exit, opp changes out of devfreq, suspend

 *                      and resume of per device devfreq during device idle.

 *

 * Note that the callbacks are called with devfreq->lock locked by devfreq.

 */

struct devfreq_governor {

	struct list_head node;



	const char name[DEVFREQ_NAME_LEN];

	const unsigned int immutable;

	int (*get_target_freq)(struct devfreq *this, unsigned long *freq);

	int (*event_handler)(struct devfreq *devfreq,

				unsigned int event, void *data);

};



/**

 * struct devfreq - Device devfreq structure

 * @node:	list node - contains the devices with devfreq that have been