From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753438AbbG0M2v (ORCPT ); Mon, 27 Jul 2015 08:28:51 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:33910 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753305AbbG0M2s (ORCPT ); Mon, 27 Jul 2015 08:28:48 -0400 From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, preeti.lkml@gmail.com, Viresh Kumar , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 4/9] cpufreq: governor: Drop __gov_queue_work() Date: Mon, 27 Jul 2015 17:58:09 +0530 Message-Id: <4f7aef4f032e082a5093b91d244647f339ef6558.1437999691.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __gov_queue_work() isn't required anymore and can be merged with gov_queue_work(). Do it. Signed-off-by: Viresh Kumar --- drivers/cpufreq/cpufreq_governor.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index a890450711bb..3ddc27764e10 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -158,25 +158,20 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu) } EXPORT_SYMBOL_GPL(dbs_check_cpu); -static inline void __gov_queue_work(int cpu, struct dbs_data *dbs_data, - unsigned int delay) -{ - struct cpu_dbs_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu); - - mod_delayed_work_on(cpu, system_wq, &cdbs->dwork, delay); -} - void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy, unsigned int delay, const struct cpumask *cpus) { - int i; + struct cpu_dbs_info *cdbs; + int cpu; mutex_lock(&cpufreq_governor_lock); if (!policy->governor_enabled) goto out_unlock; - for_each_cpu(i, cpus) - __gov_queue_work(i, dbs_data, delay); + for_each_cpu(cpu, cpus) { + cdbs = dbs_data->cdata->get_cpu_cdbs(cpu); + mod_delayed_work_on(cpu, system_wq, &cdbs->dwork, delay); + } out_unlock: mutex_unlock(&cpufreq_governor_lock); -- 2.4.0