From patchwork Thu Mar 26 15:53:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 6100351 Return-Path: X-Original-To: patchwork-linux-mediatek@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2CDF8BF90F for ; Thu, 26 Mar 2015 15:55:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43EC2203C3 for ; Thu, 26 Mar 2015 15:55:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CFFB203A1 for ; Thu, 26 Mar 2015 15:55:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbA7t-0002a0-4v; Thu, 26 Mar 2015 15:55:21 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbA7A-00012k-W8 for linux-mediatek@lists.infradead.org; Thu, 26 Mar 2015 15:54:38 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YbA6k-0007fd-D0; Thu, 26 Mar 2015 16:54:10 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.84) (envelope-from ) id 1YbA6e-0001dS-KD; Thu, 26 Mar 2015 16:54:04 +0100 From: Sascha Hauer To: linux-pm@vger.kernel.org Subject: [PATCH 01/13] thermal: Make temperatures consistently unsigned long Date: Thu, 26 Mar 2015 16:53:48 +0100 Message-Id: <1427385240-6086-2-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> References: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mediatek@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.0 (/) Cc: Stephen Warren , Sascha Hauer , linux-kernel@vger.kernel.org, Eduardo Valentin , Mikko Perttunen , linux-mediatek@lists.infradead.org, kernel@pengutronix.de, Zhang Rui , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 The thermal framework uses int, long and unsigned long for temperatures in millicelsius. The majority of functions uses unsigned long, so change the remaining functions to use this type aswell. Signed-off-by: Sascha Hauer --- drivers/thermal/thermal_core.c | 10 +++++----- include/linux/thermal.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 174d3bc..0e4ad7c 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -378,7 +378,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz, if (trip_type == THERMAL_TRIP_CRITICAL) { dev_emerg(&tz->device, - "critical temperature reached(%d C),shutting down\n", + "critical temperature reached(%lu C),shutting down\n", tz->temperature / 1000); orderly_poweroff(true); } @@ -453,7 +453,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_get_temp); static void update_temperature(struct thermal_zone_device *tz) { - long temp; + unsigned long temp; int ret; ret = thermal_zone_get_temp(tz, &temp); @@ -469,7 +469,7 @@ static void update_temperature(struct thermal_zone_device *tz) mutex_unlock(&tz->lock); trace_thermal_temperature(tz); - dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n", + dev_dbg(&tz->device, "last_temperature=%lu, current_temperature=%lu\n", tz->last_temperature, tz->temperature); } @@ -512,7 +512,7 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *attr, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); - long temperature; + unsigned long temperature; int ret; ret = thermal_zone_get_temp(tz, &temperature); @@ -520,7 +520,7 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf) if (ret) return ret; - return sprintf(buf, "%ld\n", temperature); + return sprintf(buf, "%lu\n", temperature); } static ssize_t diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 5eac316..db6c12b 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -180,9 +180,9 @@ struct thermal_zone_device { int trips; int passive_delay; int polling_delay; - int temperature; - int last_temperature; - int emul_temperature; + unsigned long temperature; + unsigned long last_temperature; + unsigned long emul_temperature; int passive; unsigned int forced_passive; struct thermal_zone_device_ops *ops;