From patchwork Mon Jun 22 08:02:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 50137 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D65B321594 for ; Mon, 22 Jun 2015 08:03:30 +0000 (UTC) Received: by wguu7 with SMTP id u7sf26848612wgu.0 for ; Mon, 22 Jun 2015 01:03:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=QjJFu+nLlyDpWnsn2ToA7eh7Bd6Be+x8xo/LNZnZQDk=; b=AOI8kQ5bLnaxezlvg4kxTxUcWfS7Tg8o7rUH25H+cilVttLbzJw/Z3uymj2+agjs49 +zNAUu60GeYCHhv5zefxa4oh6vOMoyyyufQj9HIBmno8kRNiUhgH3mXY9o8hRwb0vxFp iiQvLvdZ/kkfu+kcjzfY/3bGKNoAzrBEal6ve9kkJdxpKBdjT7zodHQK5ZVDNqrg0YXG FjfLbxamCEqXu7zSSsvGkiQGVgbuZ+8WKsQuXE8VJK3GtynCKqqB5d02vO5wSfAGMKCC hQ+E0HhyD3LZLn++nK+dTy7LDIhyikje+wUmnKhzGjmDEtd0a4XC9GzOXaFh7mSURM1e 5Ktw== X-Gm-Message-State: ALoCoQmNPkX3Ce/qJgQ/52+ux2tSCyLdXgTMrN0MZxFrqpyYsLJWGyjUbI/E14qhAbxmS0ugpr/b X-Received: by 10.194.142.205 with SMTP id ry13mr24277557wjb.2.1434960210193; Mon, 22 Jun 2015 01:03:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.111 with SMTP id q15ls741517laa.28.gmail; Mon, 22 Jun 2015 01:03:30 -0700 (PDT) X-Received: by 10.112.220.7 with SMTP id ps7mr28524280lbc.72.1434960210034; Mon, 22 Jun 2015 01:03:30 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id b2si15893880lak.85.2015.06.22.01.03.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2015 01:03:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagx9 with SMTP id x9so16770546lag.1 for ; Mon, 22 Jun 2015 01:03:30 -0700 (PDT) X-Received: by 10.112.160.165 with SMTP id xl5mr1390035lbb.36.1434960209953; Mon, 22 Jun 2015 01:03:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2208776lbb; Mon, 22 Jun 2015 01:03:28 -0700 (PDT) X-Received: by 10.68.216.129 with SMTP id oq1mr56684543pbc.36.1434960208271; Mon, 22 Jun 2015 01:03:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j10si28342941pbq.257.2015.06.22.01.03.27; Mon, 22 Jun 2015 01:03:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756124AbbFVID0 (ORCPT + 11 others); Mon, 22 Jun 2015 04:03:26 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34770 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755999AbbFVIDZ (ORCPT ); Mon, 22 Jun 2015 04:03:25 -0400 Received: by pabvl15 with SMTP id vl15so82801642pab.1 for ; Mon, 22 Jun 2015 01:03:25 -0700 (PDT) X-Received: by 10.70.36.102 with SMTP id p6mr56009563pdj.18.1434960205368; Mon, 22 Jun 2015 01:03:25 -0700 (PDT) Received: from localhost ([122.167.71.211]) by mx.google.com with ESMTPSA id ni1sm18921949pdb.32.2015.06.22.01.03.24 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 22 Jun 2015 01:03:24 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Preeti U Murthy Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, Viresh Kumar Subject: [PATCH 05/10] cpufreq: governor: Drop __gov_queue_work() Date: Mon, 22 Jun 2015 13:32:52 +0530 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , __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 416a8c5665dd..ac288f0efb06 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);