Thread (33 messages) 33 messages, 4 authors, 2015-05-20

[PATCH 06/15] thermal: inline only once used function

From: Mikko Perttunen <hidden>
Date: 2015-05-20 07:28:16
Also in: linux-mediatek, linux-pm, lkml

On 05/13/15 11:52, Sascha Hauer wrote:
quoted hunk ↗ jump to hunk
Inline update_temperature into its only caller to make the code
more readable.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
  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);
This is a slight change in that if get_temp fails, governors were 
updated before but aren't now. But I don't know why that would matter.

Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help