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

Commit fee29064 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm-cpufreq: fix cpufreq compile error problem"

parents 3ff8775b ae329125

drivers/cpufreq/qcom-cpufreq.c

+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * MSM architecture cpufreq driver

 *

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2007-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2007-2020, The Linux Foundation. All rights reserved.

 * Author: Mike A. Chan <mikechan@google.com>

 *

 */
@@ -49,7 +49,6 @@ static int set_cpu_freq(struct cpufreq_policy *policy, unsigned int new_freq, 


	freqs.old = policy->cur;

	freqs.new = new_freq;

	freqs.cpu = policy->cpu;



	trace_cpu_frequency_switch_start(freqs.old, freqs.new, policy->cpu);

	cpufreq_freq_transition_begin(policy, &freqs);
@@ -123,7 +122,7 @@ static unsigned int msm_cpufreq_resolve_freq(struct cpufreq_policy *policy, 
	return freq;

}



static int msm_cpufreq_verify(struct cpufreq_policy *policy)

static int msm_cpufreq_verify(struct cpufreq_policy_data *policy)

{

	cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,

			policy->cpuinfo.max_freq);

include/trace/events/power.h

+42 −0
Original line number Diff line number Diff line
@@ -203,6 +203,48 @@ TRACE_EVENT(cpu_frequency_limits, 
		  (unsigned long)__entry->cpu_id)

);



TRACE_EVENT(cpu_frequency_switch_start,



	TP_PROTO(unsigned int start_freq, unsigned int end_freq,

		 unsigned int cpu_id),



	TP_ARGS(start_freq, end_freq, cpu_id),



	TP_STRUCT__entry(

		__field(u32, start_freq)

		__field(u32, end_freq)

		__field(u32, cpu_id)

	),



	TP_fast_assign(

		__entry->start_freq = start_freq;

		__entry->end_freq = end_freq;

		__entry->cpu_id = cpu_id;

	),



	TP_printk("start=%lu end=%lu cpu_id=%lu",

		  (unsigned long)__entry->start_freq,

		  (unsigned long)__entry->end_freq,

		  (unsigned long)__entry->cpu_id)

);



TRACE_EVENT(cpu_frequency_switch_end,



	TP_PROTO(unsigned int cpu_id),



	TP_ARGS(cpu_id),



	TP_STRUCT__entry(

		__field(u32, cpu_id)

	),



	TP_fast_assign(

		__entry->cpu_id = cpu_id;

	),



	TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id)

);



TRACE_EVENT(device_pm_callback_start,



	TP_PROTO(struct device *dev, const char *pm_ops, int event),