Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66776a67 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'pull_req_20150331' of... 

Merge tag 'pull_req_20150331' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq updates for v4.1 from MyungJoo Ham.

"This set includes tegra driver update and style fixes."

* tag 'pull_req_20150331' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: tegra: Register governor on module init
  PM / devfreq: tegra: Enable interrupts after resuming the devfreq monitor
  PM / devfreq: tegra: Set drvdata before enabling the irq
  PM / devfreq: tegra: remove operating-points
  PM / devfreq: tegra: Use clock rate constraints
  PM / devfreq: tegra: Update to v5 of the submitted patches
  PM / devfreq: correct misleading comment
  PM / devfreq: event: Add const keyword for devfreq_event_ops structure
parents e42391cd 358b615f

drivers/devfreq/devfreq.c

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, 
/**

 * _remove_devfreq() - Remove devfreq from the list and release its resources.

 * @devfreq:	the devfreq struct

 * @skip:	skip calling device_unregister().

 */

static void _remove_devfreq(struct devfreq *devfreq)

{

drivers/devfreq/event/exynos-ppmu.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static int exynos_ppmu_get_event(struct devfreq_event_dev *edev, 
	return 0;

}



static struct devfreq_event_ops exynos_ppmu_ops = {

static const struct devfreq_event_ops exynos_ppmu_ops = {

	.disable = exynos_ppmu_disable,

	.set_event = exynos_ppmu_set_event,

	.get_event = exynos_ppmu_get_event,

drivers/devfreq/tegra-devfreq.c

+288 −221

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/devfreq-event.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct devfreq_event_desc { 
	const char *name;

	void *driver_data;



	struct devfreq_event_ops *ops;

	const struct devfreq_event_ops *ops;

};



#if defined(CONFIG_PM_DEVFREQ_EVENT)