From patchwork Fri Nov 28 09:44:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 41684 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2CF73244C2 for ; Fri, 28 Nov 2014 09:45:47 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id s18sf3894562lam.10 for ; Fri, 28 Nov 2014 01:45:46 -0800 (PST) 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=7YWS+VAg20YlYAmHOrIu0qHa9z9BkCp9Tld+RdKEcNE=; b=LOIpJZiWzXqW+J8aT5EnTx3E/68OyO0bfjjIqurCkIjRNMqDmpdjZ/T0Zgf4Z6BZTV N08w3y9wL529dGLOIIIB1xTGAPGHpCj4gZhjF+RHtfsYr8Lkyx7+R8CvdXM8SjhlwyFO mSgEZqInpeV+dTTTZlPlPLD1Utk8LdXWb4yWqHdH49srAal74+qF5F+M82BWBV5HRjKU mWkxTe4sKQK3fKtsUbM961i58Oovkeugeg+aO/MY7bij+ZfP48uo7cpvwQRJsHq9Fz/8 mCSJfrLSKmPJ3mn6ZnW5mLFNv6l35eIiL7bLkwcYLl8URVZzRiO2Rua5ahGI5pXE4gwE ycTg== X-Gm-Message-State: ALoCoQn2vUww/jwIacO9wSzkB8PIxXpsjF5A7lyganGR+9bR+ChQZsr2AD+b71urPTKk3f7ZZTWU X-Received: by 10.112.154.194 with SMTP id vq2mr6321883lbb.10.1417167946142; Fri, 28 Nov 2014 01:45:46 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.98 with SMTP id lb2ls950258lab.81.gmail; Fri, 28 Nov 2014 01:45:45 -0800 (PST) X-Received: by 10.152.43.229 with SMTP id z5mr41631560lal.86.1417167945779; Fri, 28 Nov 2014 01:45:45 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id ki7si9512277lbc.10.2014.11.28.01.45.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Nov 2014 01:45:45 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id pv20so759462lab.27 for ; Fri, 28 Nov 2014 01:45:45 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr42371287lbo.32.1417167945699; Fri, 28 Nov 2014 01:45:45 -0800 (PST) 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.184.201 with SMTP id ew9csp60486lbc; Fri, 28 Nov 2014 01:45:44 -0800 (PST) X-Received: by 10.68.246.164 with SMTP id xx4mr71442572pbc.64.1417167944037; Fri, 28 Nov 2014 01:45:44 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vj10si15336419pbc.138.2014.11.28.01.45.43 for ; Fri, 28 Nov 2014 01:45:44 -0800 (PST) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751763AbaK1Jpm (ORCPT + 12 others); Fri, 28 Nov 2014 04:45:42 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:55558 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbaK1Jpl (ORCPT ); Fri, 28 Nov 2014 04:45:41 -0500 Received: by mail-pd0-f178.google.com with SMTP id g10so6460358pdj.9 for ; Fri, 28 Nov 2014 01:45:41 -0800 (PST) X-Received: by 10.66.97.39 with SMTP id dx7mr71626036pab.65.1417167941455; Fri, 28 Nov 2014 01:45:41 -0800 (PST) Received: from localhost ([122.167.111.40]) by mx.google.com with ESMTPSA id zn2sm9360959pbb.41.2014.11.28.01.45.40 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Nov 2014 01:45:40 -0800 (PST) From: Viresh Kumar To: linux-pm@vger.kernel.org, edubezval@gmail.com Cc: linaro-kernel@lists.linaro.org, rui.zhang@intel.com, Viresh Kumar Subject: [PATCH 17/26] cpu_cooling: Merge cpufreq_apply_cooling() into cpufreq_set_cur_state() Date: Fri, 28 Nov 2014 15:14:11 +0530 Message-Id: <24d76b5957d9c9c54f372f1ba8cc5cee8faf0d64.1417167599.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.3.693.g996b0fd 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.54 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: , cpufreq_apply_cooling() has a single caller, cpufreq_set_cur_state() and cpufreq_set_cur_state() is an unnecessary wrapper over cpufreq_apply_cooling(). Get rid of it by merging both routines. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 58 ++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index ca8f1bb..9673b48 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -219,44 +219,6 @@ static unsigned int get_cpu_frequency(unsigned int cpu, unsigned long level) } /** - * cpufreq_apply_cooling - function to apply frequency clipping. - * @cpufreq_device: cpufreq_cooling_device pointer containing frequency - * clipping data. - * @cooling_state: value of the cooling state. - * - * Function used to make sure the cpufreq layer is aware of current thermal - * limits. The limits are applied by updating the cpufreq policy. - * - * Return: 0 on success, an error code otherwise (-EINVAL in case wrong - * cooling state). - */ -static int cpufreq_apply_cooling(struct cpufreq_cooling_device *cpufreq_device, - unsigned long cooling_state) -{ - unsigned int clip_freq; - struct cpumask *mask = &cpufreq_device->allowed_cpus; - unsigned int cpu = cpumask_any(mask); - - /* Check if the old cooling action is same as new cooling action */ - if (cpufreq_device->cpufreq_state == cooling_state) - return 0; - - clip_freq = get_cpu_frequency(cpu, cooling_state); - if (!clip_freq) - return -EINVAL; - - cpufreq_device->cpufreq_state = cooling_state; - cpufreq_device->cpufreq_val = clip_freq; - notify_device = cpufreq_device; - - cpufreq_update_policy(cpu); - - notify_device = NOTIFY_INVALID; - - return 0; -} - -/** * cpufreq_thermal_notifier - notifier callback for cpufreq policy change. * @nb: struct notifier_block * with callback info. * @event: value showing cpufreq event for which this function invoked. @@ -357,8 +319,26 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) { struct cpufreq_cooling_device *cpufreq_device = cdev->devdata; + unsigned int cpu = cpumask_any(&cpufreq_device->allowed_cpus); + unsigned int clip_freq; - return cpufreq_apply_cooling(cpufreq_device, state); + /* Check if the old cooling action is same as new cooling action */ + if (cpufreq_device->cpufreq_state == state) + return 0; + + clip_freq = get_cpu_frequency(cpu, state); + if (!clip_freq) + return -EINVAL; + + cpufreq_device->cpufreq_state = state; + cpufreq_device->cpufreq_val = clip_freq; + notify_device = cpufreq_device; + + cpufreq_update_policy(cpu); + + notify_device = NOTIFY_INVALID; + + return 0; } /* Bind cpufreq callbacks to thermal cooling device ops */