Merge back cpufreq updates for v5.11. (ef7ece9a) · Commits · 戴 / test

drivers/cpufreq/cpufreq.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -2123,7 +2123,7 @@ static int __target_intermediate(struct cpufreq_policy *policy,
		static int __target_index(struct cpufreq_policy *policy, int index)
		{
		struct cpufreq_freqs freqs = {.old = policy->cur, .flags = 0};
		unsigned int intermediate_freq = 0;
		unsigned int restore_freq, intermediate_freq = 0;
		unsigned int newfreq = policy->freq_table[index].frequency;
		int retval = -EINVAL;
		bool notify;
		@@ -2131,6 +2131,9 @@ static int __target_index(struct cpufreq_policy *policy, int index)
		if (newfreq == policy->cur)
		return 0;

		/* Save last value to restore later on errors */
		restore_freq = policy->cur;

		notify = !(cpufreq_driver->flags & CPUFREQ_ASYNC_NOTIFICATION);
		if (notify) {
		/* Handle switching to intermediate frequency */
		@@ -2168,7 +2171,7 @@ static int __target_index(struct cpufreq_policy *policy, int index)
		*/
		if (unlikely(retval && intermediate_freq)) {
		freqs.old = intermediate_freq;
		freqs.new = policy->restore_freq;
		freqs.new = restore_freq;
		cpufreq_freq_transition_begin(policy, &freqs);
		cpufreq_freq_transition_end(policy, &freqs, 0);
		}
		@@ -2203,9 +2206,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
		!(cpufreq_driver->flags & CPUFREQ_NEED_UPDATE_LIMITS))
		return 0;

		/* Save last value to restore later on errors */
		policy->restore_freq = policy->cur;

		if (cpufreq_driver->target)
		return cpufreq_driver->target(policy, target_freq, relation);

+0 −5

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ struct cpufreq_policy {
		unsigned int max; /* in kHz */
		unsigned int cur; /* in kHz, only needed if cpufreq
		* governors are used */
		unsigned int restore_freq; /* = policy->cur before transition */
		unsigned int suspend_freq; /* freq to set during suspend */

		unsigned int policy; /* see above */
		@@ -314,10 +313,6 @@ struct cpufreq_driver {
		/* define one out of two */
		int (setpolicy)(struct cpufreq_policy policy);

		/*
		* On failure, should always restore frequency to policy->restore_freq
		* (i.e. old freq).
		*/
		int (target)(struct cpufreq_policy policy,
		unsigned int target_freq,
		unsigned int relation); /* Deprecated */