From patchwork Mon Jun 17 13:24:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 2733421 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 28FE09F8E1 for ; Mon, 17 Jun 2013 13:25:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F766202C6 for ; Mon, 17 Jun 2013 13:25:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC1B620342 for ; Mon, 17 Jun 2013 13:25:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932548Ab3FQNZE (ORCPT ); Mon, 17 Jun 2013 09:25:04 -0400 Received: from mga11.intel.com ([192.55.52.93]:50832 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932529Ab3FQNZD (ORCPT ); Mon, 17 Jun 2013 09:25:03 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 17 Jun 2013 06:25:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,881,1363158000"; d="scan'208";a="354717562" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.20.69]) by fmsmga002.fm.intel.com with ESMTP; 17 Jun 2013 06:24:59 -0700 From: Zhang Rui To: linux-pm@vger.kernel.org Cc: eduardo.valentin@ti.com, durgadoss.r@intel.com, shawn.guo@linaro.org, ruslan.ruslichenko@ti.com, Zhang Rui Subject: [RFC PATCH 6/6] Thermal: step_wise: set next cooling target explicitly Date: Mon, 17 Jun 2013 21:24:28 +0800 Message-Id: <1371475468-5351-7-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371475468-5351-1-git-send-email-rui.zhang@intel.com> References: <1371475468-5351-1-git-send-email-rui.zhang@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Set the next target state explicitly for each thermal trend, in step_wise governor, to provide more readability, and to follow the cooling algorithm description strictly. Signed-off-by: Zhang Rui --- drivers/thermal/step_wise.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index 53b56e6..ffa553f 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -60,7 +60,6 @@ static unsigned long get_target_state(struct thermal_instance *instance, * cdev in use to determine the next_target. */ cdev->ops->get_cur_state(cdev, &cur_state); - next_target = instance->target; switch (trend) { case THERMAL_TREND_RAISING: @@ -69,11 +68,14 @@ static unsigned long get_target_state(struct thermal_instance *instance, (cur_state + 1) : instance->upper; if (next_target < instance->lower) next_target = instance->lower; - } + } else + next_target = instance->target; break; case THERMAL_TREND_RAISE_FULL: if (throttle) next_target = instance->upper; + else + next_target = instance->target; break; case THERMAL_TREND_DROPPING: if (throttle) { @@ -99,7 +101,10 @@ static unsigned long get_target_state(struct thermal_instance *instance, break; case THERMAL_TREND_STABLE: /* Do nothing */ + next_target = instance->target; + break; default: + next_target = instance->target; break; }