From patchwork Fri Nov 28 09:44:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 5402491 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3FCCBBEEA8 for ; Fri, 28 Nov 2014 09:45:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0EE3520142 for ; Fri, 28 Nov 2014 09:45:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDFA520123 for ; Fri, 28 Nov 2014 09:45:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbaK1Jpq (ORCPT ); Fri, 28 Nov 2014 04:45:46 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:43741 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbaK1Jpp (ORCPT ); Fri, 28 Nov 2014 04:45:45 -0500 Received: by mail-pd0-f170.google.com with SMTP id fp1so6432625pdb.1 for ; Fri, 28 Nov 2014 01:45:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=4hT8bhaFJI3aXE4IiR8tUWC/xlAuaa10r7pIi2lp7W0=; b=kIgRm2ketCBInud27fdpER4sqQUiuqv/dmi6jeSXtfOFugcuB13KkRV/Bfu+rwuUbs xf/bNqvcDCaD4CZbKEqFRuIdQmRPIrAkRF3FpSFf0KqXFSQoA4bvi6wjVMKkBrprDdEm NNnColGx7O7U0RolG2nEIVlUyBOnLzjjIprpY5qHJM/dZeK6IWnL2XcZEAV2J1AzWXLg VMK4MUPREh8oaBYgCHvwAKg7JE/swnFOIJM3OiCUbvObmJlNrlna7m+1qWQKHemiCJkM tZPOBG+KRhSenDsGC4TqcOfa9hbE43aMlPlKXRw+0kIgYI4cfD+pmgCQUFNiswOoQRIz 14QQ== X-Gm-Message-State: ALoCoQm/wwFflMWVvFNtOBIHrHy0ASziKlTYcElCHW7giKDVwbQ6T/YtUOTICsNgtffNDsDomaHG X-Received: by 10.66.146.193 with SMTP id te1mr72789105pab.154.1417167945208; Fri, 28 Nov 2014 01:45:45 -0800 (PST) Received: from localhost ([122.167.111.40]) by mx.google.com with ESMTPSA id lr4sm9442907pab.42.2014.11.28.01.45.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Nov 2014 01:45:44 -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 18/26] cpu_cooling: Merge get_cpu_frequency() into cpufreq_set_cur_state() Date: Fri, 28 Nov 2014 15:14:12 +0530 Message-Id: <7b0ee76e42a06e915d4699b2ff83fdf12f7b1543.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: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP get_cpu_frequency() is used from only one place, i.e. cpufreq_set_cur_state(). And there is no need to have this extra level of function calls. Merge them. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 9673b48..5815abf 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -195,30 +195,6 @@ unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq) EXPORT_SYMBOL_GPL(cpufreq_cooling_get_level); /** - * get_cpu_frequency - get the absolute value of frequency from level. - * @cpu: cpu for which frequency is fetched. - * @level: cooling level - * - * This function matches cooling level with frequency. Based on a cooling level - * of frequency, equals cooling state of cpu cooling device, it will return - * the corresponding frequency. - * e.g level=0 --> 1st MAX FREQ, level=1 ---> 2nd MAX FREQ, .... etc - * - * Return: 0 on error, the corresponding frequency otherwise. - */ -static unsigned int get_cpu_frequency(unsigned int cpu, unsigned long level) -{ - int ret = 0; - unsigned int freq; - - ret = get_property(cpu, level, &freq, GET_FREQ); - if (ret) - return 0; - - return freq; -} - -/** * 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. @@ -321,14 +297,15 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, struct cpufreq_cooling_device *cpufreq_device = cdev->devdata; unsigned int cpu = cpumask_any(&cpufreq_device->allowed_cpus); unsigned int clip_freq; + int ret = 0; /* 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; + ret = get_property(cpu, state, &clip_freq, GET_FREQ); + if (ret) + return ret; cpufreq_device->cpufreq_state = state; cpufreq_device->cpufreq_val = clip_freq;