| From c3a0c39f60e1cea0139d989209bfb7ce6773f3b9 Mon Sep 17 00:00:00 2001 |
| From: Viresh Kumar <viresh.kumar@linaro.org> |
| Date: Wed, 19 Mar 2014 11:24:58 +0530 |
| Subject: cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE} |
| |
| Two cpufreq notifiers CPUFREQ_RESUMECHANGE and CPUFREQ_SUSPENDCHANGE have |
| not been used for some time, so remove them to clean up code a bit. |
| |
| Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> |
| [rjw: Changelog] |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| |
| (cherry picked from commit 0b443ead714f0cba797a7f2476dd756f22b5421e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/cpu-freq/core.txt | 4 ---- |
| arch/arm/kernel/smp.c | 3 +-- |
| arch/arm/kernel/smp_twd.c | 2 +- |
| arch/arm/mach-pxa/viper.c | 3 --- |
| arch/powerpc/oprofile/op_model_cell.c | 3 +-- |
| arch/sparc/kernel/time_64.c | 3 +-- |
| arch/x86/kernel/tsc.c | 3 +-- |
| drivers/cpufreq/cpufreq.c | 3 +-- |
| drivers/pcmcia/sa11xx_base.c | 3 --- |
| include/linux/cpufreq.h | 2 -- |
| 10 files changed, 6 insertions(+), 23 deletions(-) |
| |
| --- a/Documentation/cpu-freq/core.txt |
| +++ b/Documentation/cpu-freq/core.txt |
| @@ -92,7 +92,3 @@ values: |
| cpu - number of the affected CPU |
| old - old frequency |
| new - new frequency |
| - |
| -If the cpufreq core detects the frequency has changed while the system |
| -was suspended, these notifiers are called with CPUFREQ_RESUMECHANGE as |
| -second argument. |
| --- a/arch/arm/kernel/smp.c |
| +++ b/arch/arm/kernel/smp.c |
| @@ -683,8 +683,7 @@ static int cpufreq_callback(struct notif |
| } |
| |
| if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || |
| - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || |
| - (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) { |
| + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { |
| loops_per_jiffy = cpufreq_scale(global_l_p_j_ref, |
| global_l_p_j_ref_freq, |
| freq->new); |
| --- a/arch/arm/kernel/smp_twd.c |
| +++ b/arch/arm/kernel/smp_twd.c |
| @@ -166,7 +166,7 @@ static int twd_cpufreq_transition(struct |
| * frequency. The timer is local to a cpu, so cross-call to the |
| * changing cpu. |
| */ |
| - if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE) |
| + if (state == CPUFREQ_POSTCHANGE) |
| smp_call_function_single(freqs->cpu, twd_update_frequency, |
| NULL, 1); |
| |
| --- a/arch/arm/mach-pxa/viper.c |
| +++ b/arch/arm/mach-pxa/viper.c |
| @@ -885,9 +885,6 @@ static int viper_cpufreq_notifier(struct |
| viper_set_core_cpu_voltage(freq->new, 0); |
| } |
| break; |
| - case CPUFREQ_RESUMECHANGE: |
| - viper_set_core_cpu_voltage(freq->new, 0); |
| - break; |
| default: |
| /* ignore */ |
| break; |
| --- a/arch/powerpc/oprofile/op_model_cell.c |
| +++ b/arch/powerpc/oprofile/op_model_cell.c |
| @@ -1121,8 +1121,7 @@ oprof_cpufreq_notify(struct notifier_blo |
| int ret = 0; |
| struct cpufreq_freqs *frq = data; |
| if ((val == CPUFREQ_PRECHANGE && frq->old < frq->new) || |
| - (val == CPUFREQ_POSTCHANGE && frq->old > frq->new) || |
| - (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) |
| + (val == CPUFREQ_POSTCHANGE && frq->old > frq->new)) |
| set_spu_profiling_frequency(frq->new, spu_cycle_reset); |
| return ret; |
| } |
| --- a/arch/sparc/kernel/time_64.c |
| +++ b/arch/sparc/kernel/time_64.c |
| @@ -659,8 +659,7 @@ static int sparc64_cpufreq_notifier(stru |
| ft->clock_tick_ref = cpu_data(cpu).clock_tick; |
| } |
| if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || |
| - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || |
| - (val == CPUFREQ_RESUMECHANGE)) { |
| + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { |
| cpu_data(cpu).clock_tick = |
| cpufreq_scale(ft->clock_tick_ref, |
| ft->ref_freq, |
| --- a/arch/x86/kernel/tsc.c |
| +++ b/arch/x86/kernel/tsc.c |
| @@ -915,8 +915,7 @@ static int time_cpufreq_notifier(struct |
| tsc_khz_ref = tsc_khz; |
| } |
| if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || |
| - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || |
| - (val == CPUFREQ_RESUMECHANGE)) { |
| + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { |
| *lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new); |
| |
| tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new); |
| --- a/drivers/cpufreq/cpufreq.c |
| +++ b/drivers/cpufreq/cpufreq.c |
| @@ -257,8 +257,7 @@ static void adjust_jiffies(unsigned long |
| pr_debug("saving %lu as reference value for loops_per_jiffy; " |
| "freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq); |
| } |
| - if ((val == CPUFREQ_POSTCHANGE && ci->old != ci->new) || |
| - (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) { |
| + if (val == CPUFREQ_POSTCHANGE && ci->old != ci->new) { |
| loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq, |
| ci->new); |
| pr_debug("scaling loops_per_jiffy to %lu " |
| --- a/drivers/pcmcia/sa11xx_base.c |
| +++ b/drivers/pcmcia/sa11xx_base.c |
| @@ -125,9 +125,6 @@ sa1100_pcmcia_frequency_change(struct so |
| if (freqs->new < freqs->old) |
| sa1100_pcmcia_set_mecr(skt, freqs->new); |
| break; |
| - case CPUFREQ_RESUMECHANGE: |
| - sa1100_pcmcia_set_mecr(skt, freqs->new); |
| - break; |
| } |
| |
| return 0; |
| --- a/include/linux/cpufreq.h |
| +++ b/include/linux/cpufreq.h |
| @@ -306,8 +306,6 @@ cpufreq_verify_within_cpu_limits(struct |
| /* Transition notifiers */ |
| #define CPUFREQ_PRECHANGE (0) |
| #define CPUFREQ_POSTCHANGE (1) |
| -#define CPUFREQ_RESUMECHANGE (8) |
| -#define CPUFREQ_SUSPENDCHANGE (9) |
| |
| /* Policy Notifiers */ |
| #define CPUFREQ_ADJUST (0) |