Commit 6bfb7c74 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: remove redundant CPUFREQ_INCOMPATIBLE notifier event 



What's being done from CPUFREQ_INCOMPATIBLE, can also be done with
CPUFREQ_ADJUST. There is nothing special with CPUFREQ_INCOMPATIBLE
notifier.

Kill CPUFREQ_INCOMPATIBLE and fix its usage sites.

This also updates the numbering of notifier events to remove holes.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1453863f

Documentation/cpu-freq/core.txt

+2 −5
Original line number Diff line number Diff line
@@ -55,16 +55,13 @@ transition notifiers. 
----------------------------



These are notified when a new policy is intended to be set. Each

CPUFreq policy notifier is called three times for a policy transition:

CPUFreq policy notifier is called twice for a policy transition:



1.) During CPUFREQ_ADJUST all CPUFreq notifiers may change the limit if

    they see a need for this - may it be thermal considerations or

    hardware limitations.



2.) During CPUFREQ_INCOMPATIBLE only changes may be done in order to avoid

    hardware failure.



3.) And during CPUFREQ_NOTIFY all notifiers are informed of the new policy

2.) And during CPUFREQ_NOTIFY all notifiers are informed of the new policy

   - if two hardware drivers failed to agree on a new policy before this

   stage, the incompatible hardware shall be shut down, and the user

   informed of this.

drivers/acpi/processor_perflib.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int acpi_processor_ppc_notifier(struct notifier_block *nb, 
	if (ignore_ppc)

		return 0;



	if (event != CPUFREQ_INCOMPATIBLE)

	if (event != CPUFREQ_ADJUST)

		return 0;



	mutex_lock(&performance_mutex);

drivers/cpufreq/cpufreq.c

+0 −4
Original line number Diff line number Diff line
@@ -2206,10 +2206,6 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, 
	blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

			CPUFREQ_ADJUST, new_policy);



	/* adjust if necessary - hardware incompatibility*/

	blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

			CPUFREQ_INCOMPATIBLE, new_policy);



	/*

	 * verify the cpu speed can be set within this limit, which might be

	 * different to the first one

drivers/cpufreq/ppc_cbe_cpufreq_pmi.c

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static int pmi_notifier(struct notifier_block *nb, 
	struct cpufreq_frequency_table *cbe_freqs;

	u8 node;



	/* Should this really be called for CPUFREQ_ADJUST, CPUFREQ_INCOMPATIBLE

	 * and CPUFREQ_NOTIFY policy events?)

	/* Should this really be called for CPUFREQ_ADJUST and CPUFREQ_NOTIFY

	 * policy events?)

	 */

	if (event == CPUFREQ_START)

		return 0;

drivers/video/fbdev/pxafb.c

+0 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,6 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data) 


	switch (val) {

	case CPUFREQ_ADJUST:

	case CPUFREQ_INCOMPATIBLE:

		pr_debug("min dma period: %d ps, "

			"new clock %d kHz\n", pxafb_display_dma_period(var),

			policy->max);

CRA Git | Maintained and supported by SUSTech CRA and CCSE