From: Wu Fengguang <fengguang.wu@intel.com>
Date: Wed, 29 Apr 2015 01:10:16 +0000 (+0800)
Subject: Thermal: Intel SoC: fix simple_return.cocci warnings
X-Git-Tag: firefly_0821_release~176^2~1565^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd7081ae2bbd063fa4a29a01cb7004d8516e54e3;p=firefly-linux-kernel-4.4.55.git

Thermal: Intel SoC: fix simple_return.cocci warnings

drivers/thermal/intel_soc_dts_iosf.c:358:4-7: WARNING: end returns can be simpified

 Simplify a trivial if-return sequence.  Possibly combine with a
 preceding function call.
Generated by: scripts/coccinelle/misc/simple_return.cocci

CC: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---

diff --git a/drivers/thermal/intel_soc_dts_iosf.c b/drivers/thermal/intel_soc_dts_iosf.c
index d89787612c5d..42e4b6ac3875 100644
--- a/drivers/thermal/intel_soc_dts_iosf.c
+++ b/drivers/thermal/intel_soc_dts_iosf.c
@@ -350,18 +350,13 @@ int intel_soc_dts_iosf_add_read_only_critical_trip(
 	struct intel_soc_dts_sensors *sensors, int critical_offset)
 {
 	int i, j;
-	int ret;
 
 	for (i = 0; i < SOC_MAX_DTS_SENSORS; ++i) {
 		for (j = 0; j < sensors->soc_dts[i].trip_count; ++j) {
 			if (!(sensors->soc_dts[i].trip_mask & BIT(j))) {
-				ret = update_trip_temp(&sensors->soc_dts[i], j,
+				return update_trip_temp(&sensors->soc_dts[i], j,
 					sensors->tj_max - critical_offset,
 					THERMAL_TRIP_CRITICAL);
-				if (ret)
-					return ret;
-
-				return 0;
 			}
 		}
 	}