From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754709AbcDGB2L (ORCPT ); Wed, 6 Apr 2016 21:28:11 -0400 Received: from cloudserver094114.home.net.pl ([79.96.170.134]:62606 "HELO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752024AbcDGB2J (ORCPT ); Wed, 6 Apr 2016 21:28:09 -0400 From: "Rafael J. Wysocki" To: Linux PM list Cc: Viresh Kumar , Linux Kernel Mailing List , Srinivas Pandruvada Subject: [PATCH] cpufreq: Simplify switch () in cpufreq_cpu_callback() Date: Thu, 07 Apr 2016 03:30:40 +0200 Message-ID: <4473117.ktOSeKFDYJ@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.5.0-rc1+; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki Merge two switch entries that do the same thing in cpufreq_cpu_callback(). No functional changes. Signed-off-by: Rafael J. Wysocki --- 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; }