On 07-04-16, 03:30, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wyso...@intel.com> > > Merge two switch entries that do the same thing in > cpufreq_cpu_callback(). > > No functional changes. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wyso...@intel.com> > --- > drivers/cpufreq/cpufreq.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > Index: linux-pm/drivers/cpufreq/cpufreq.c > =================================================================== > --- linux-pm.orig/drivers/cpufreq/cpufreq.c > +++ linux-pm/drivers/cpufreq/cpufreq.c > @@ -2312,16 +2312,13 @@ static int cpufreq_cpu_callback(struct n > > switch (action & ~CPU_TASKS_FROZEN) { > case CPU_ONLINE: > + case CPU_DOWN_FAILED: > cpufreq_online(cpu); > break; > > case CPU_DOWN_PREPARE: > cpufreq_offline(cpu); > break; > - > - case CPU_DOWN_FAILED: > - cpufreq_online(cpu); > - break; > } > return NOTIFY_OK; > }
Acked-by: Viresh Kumar <viresh.ku...@linaro.org> -- viresh