8000 Merge branches 'powercap' and 'pm-devfreq' · bsd-unix/linux@518b4e2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 518b4e2

Browse files
committed
Merge branches 'powercap' and 'pm-devfreq'
* powercap: powercap / RAPL: mark rapl_ids array as __initconst powercap / RAPL: add ID for Broadwell server * pm-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
3 parents 03aecbc + ea85dbc + 66776a6 commit 518b4e2

File tree

5 files changed

+292
-225
lines changed

5 files changed

+292
-225
lines changed

drivers/devfreq/devfreq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type,
392392
/**
393393
* _remove_devfreq() - Remove devfreq from the list and release its resources.
394394
* @devfreq: the devfreq struct
395-
* @skip: skip calling device_unregister().
396395
*/
397396
static void _remove_devfreq(struct devfreq *devfreq)
398397
{

drivers/devfreq/event/exynos-ppmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static int exynos_ppmu_get_event(struct devfreq_event_dev *edev,
194194
return 0;
195195
}
196196

197-
static struct devfreq_event_ops exynos_ppmu_ops = {
197+
static const struct devfreq_event_ops exynos_ppmu_ops = {
198198
.disable = exynos_ppmu_disable,
199199
.set_event = exynos_ppmu_set_event,
200200
.get_event = exynos_ppmu_get_event,

0 commit comments

Comments
 (0)
0