linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/16] thermal: inline only once used function
Date: Wed, 20 May 2015 15:20:36 +0200	[thread overview]
Message-ID: <1432128046-12921-7-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de>

Inline update_temperature into its only caller to make the code
more readable.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
---
 drivers/thermal/thermal_core.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index e204deb..19da022 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -450,9 +450,12 @@ exit:
 }
 EXPORT_SYMBOL_GPL(thermal_zone_get_temp);
 
-static void update_temperature(struct thermal_zone_device *tz)
+void thermal_zone_device_update(struct thermal_zone_device *tz)
 {
-	int temp, ret;
+	int temp, ret, count;
+
+	if (!tz->ops->get_temp)
+		return;
 
 	ret = thermal_zone_get_temp(tz, &temp);
 	if (ret) {
@@ -471,16 +474,6 @@ static void update_temperature(struct thermal_zone_device *tz)
 	trace_thermal_temperature(tz);
 	dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n",
 				tz->last_temperature, tz->temperature);
-}
-
-void thermal_zone_device_update(struct thermal_zone_device *tz)
-{
-	int count;
-
-	if (!tz->ops->get_temp)
-		return;
-
-	update_temperature(tz);
 
 	for (count = 0; count < tz->trips; count++)
 		handle_thermal_trip(tz, count);
-- 
2.1.4

  parent reply	other threads:[~2015-05-20 13:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20 13:20 [PATCH v4] Thermal cleanups and hardware trip points Sascha Hauer
2015-05-20 13:20 ` [PATCH 01/16] thermal: consistently use int for temperatures Sascha Hauer
2015-05-20 13:20 ` [PATCH 02/16] thermal: trivial: fix typo in comment Sascha Hauer
2015-05-20 13:20 ` [PATCH 03/16] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer
2015-05-20 13:20 ` [PATCH 04/16] thermal: Use IS_ENABLED instead of #ifdef Sascha Hauer
2015-05-20 13:20 ` [PATCH 05/16] thermal: Add comment explaining test for critical temperature Sascha Hauer
2015-05-20 13:20 ` Sascha Hauer [this message]
2015-05-20 13:20 ` [PATCH 07/16] thermal: streamline get_trend callbacks Sascha Hauer
2015-05-20 13:20 ` [PATCH 08/16] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer
2015-05-20 13:20 ` [PATCH 09/16] thermal: of: always set sensor related callbacks Sascha Hauer
2015-05-20 13:20 ` [PATCH 10/16] thermal: Make struct thermal_zone_device_ops const Sascha Hauer
2015-05-20 13:20 ` [PATCH 11/16] thermal: bang-bang governor: act on lower trip boundary Sascha Hauer
2015-05-20 13:20 ` [PATCH 12/16] thermal: thermal: Add support for hardware-tracked trip points Sascha Hauer
2015-05-20 13:20 ` [PATCH 13/16] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer
2015-05-20 13:20 ` [PATCH 14/16] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
2015-05-20 13:20 ` [PATCH 15/16] thermal: Add Mediatek thermal controller support Sascha Hauer
2015-05-20 13:20 ` [PATCH 16/16] ARM64: dts: mt8173: Add thermal/auxadc device nodes Sascha Hauer
2015-06-08  6:56 ` [PATCH v4] Thermal cleanups and hardware trip points Sascha Hauer
2015-06-22  6:38   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432128046-12921-7-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).