From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753475AbbGVXit (ORCPT ); Wed, 22 Jul 2015 19:38:49 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:44042 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752867AbbGVXiq (ORCPT ); Wed, 22 Jul 2015 19:38:46 -0400 From: "Rafael J. Wysocki" To: Linux PM list Cc: Viresh Kumar , Linux Kernel Mailing List , Russell King - ARM Linux Subject: [PATCH 1/2] cpufreq: Rename two functions related to CPU offline Date: Thu, 23 Jul 2015 02:01:26 +0200 Message-ID: <12623174.AEREjEhPIr@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/4.1.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <7868353.pEStq1MJ2a@vostro.rjw.lan> References: <7868353.pEStq1MJ2a@vostro.rjw.lan> 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 Since __cpufreq_remove_dev_prepare() and __cpufreq_remove_dev_finish() are about CPU offline rather than about CPU removal, rename them to cpufreq_offline_prepare() and cpufreq_offline_finish(), respectively. Also change their argument from a struct device pointer to a CPU number, because they use the CPU number only internally anyway. Signed-off-by: Rafael J. Wysocki --- drivers/cpufreq/cpufreq.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) Index: linux-pm/drivers/cpufreq/cpufreq.c =================================================================== --- linux-pm.orig/drivers/cpufreq/cpufreq.c +++ linux-pm/drivers/cpufreq/cpufreq.c @@ -1376,9 +1376,8 @@ out_release_rwsem: return ret; } -static void __cpufreq_remove_dev_prepare(struct device *dev) +static void cpufreq_offline_prepare(unsigned int cpu) { - unsigned int cpu = dev->id; struct cpufreq_policy *policy; pr_debug("%s: unregistering CPU %u\n", __func__, cpu); @@ -1423,9 +1422,8 @@ static void __cpufreq_remove_dev_prepare } } -static void __cpufreq_remove_dev_finish(struct device *dev) +static void cpufreq_offline_finish(unsigned int cpu) { - unsigned int cpu = dev->id; struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu); if (!policy) { @@ -1467,8 +1465,8 @@ static int cpufreq_remove_dev(struct dev return 0; if (cpu_online(cpu)) { - __cpufreq_remove_dev_prepare(dev); - __cpufreq_remove_dev_finish(dev); + cpufreq_offline_prepare(cpu); + cpufreq_offline_finish(cpu); } /* sysfs links are removed only on subsys callback */ @@ -2360,11 +2358,11 @@ static int cpufreq_cpu_callback(struct n break; case CPU_DOWN_PREPARE: - __cpufreq_remove_dev_prepare(dev); + cpufreq_offline_prepare(cpu); break; case CPU_POST_DEAD: - __cpufreq_remove_dev_finish(dev); + cpufreq_offline_finish(cpu); break; case CPU_DOWN_FAILED: